diff --git a/.gitignore b/.gitignore
index b5c821d..e27b5df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 /cldr-release-40-alpha2.zip
 /cldr-release-40-beta2.zip
 /cldr-release-40.zip
+/cldr-common-40.0.zip
diff --git a/cldr-README.md b/cldr-README.md
deleted file mode 100644
index d80aa4b..0000000
--- a/cldr-README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Unicode CLDR Project
-
-Latest Release: [v40.0](https://cldr.unicode.org/index/downloads/cldr-40) published 2021-10-20
-
-## Build Status
-
-GitHub:
-[![cldr-mvn](https://github.com/unicode-org/cldr/workflows/cldr-mvn/badge.svg)](https://github.com/unicode-org/cldr/actions?query=branch%3Amain+workflow%3A%22cldr-mvn%22)
-[![Ansible Lint](https://github.com/unicode-org/cldr/workflows/Ansible%20Lint/badge.svg)](https://github.com/unicode-org/cldr/actions?query=branch%3Amain+workflow%3A%22Ansible+Lint%22)
-
-### What is CLDR?
-The Unicode CLDR provides key building blocks for software to support the world's languages, with the largest and most extensive standard repository of locale data available. This data is used by a wide spectrum of companies for their software internationalization and localization, adapting software to the conventions of different languages for such common software tasks.
-
-See For further information:
-
-- Information about [CLDR releases and downloads](https://cldr.unicode.org/index/downloads "CLDR Download Page"),
-including the data files and LDML specification associated with each release.
-
-- Information about [Building and running CLDR Tools](https://cldr.unicode.org/development/cldr-tools "CLDR Tools Page")
-
-### Contributing
-
-Most data submissions are done via the [CLDR Survey Tool](https://st.unicode.org/cldr-apps/), which is open and available on predetermined cycles.
-Click [HERE](http://unicode.org/cldr/survey_tool.html) for information on how to obtain a survey tool account.
-
-For details about code and other contributions, see [CONTRIBUTING.md](./CONTRIBUTING.md)
-
-### Licenses
-
-- Usage of CLDR data and software is governed by the [Unicode Terms of Use](http://www.unicode.org/copyright.html)
-a copy of which is included as [unicode-license.txt](./unicode-license.txt).
-
-- Some CLDR tools depend on library dependencies managed via Maven,
-  use of these libraries is governed by separate license agreements.
-
-SPDX-License-Identifier: Unicode-DFS-2016
-
-### Copyright
-
-Copyright © 1991-2021 Unicode, Inc.
-All rights reserved.
-[Terms of use](http://www.unicode.org/copyright.html)
diff --git a/cldr-emoji-annotation.spec b/cldr-emoji-annotation.spec
index 725a1e5..af635bb 100644
--- a/cldr-emoji-annotation.spec
+++ b/cldr-emoji-annotation.spec
@@ -1,10 +1,10 @@
 %global tag_version release-40
-#%%global is_official 0%%(echo %%{tag_version} | egrep -q 'alpha|beta|final'; echo $?)
-%global is_official 0
+%global is_official 0%(echo %{tag_version} | egrep -q 'alpha|beta|final'; echo $?)
+#%%global is_official 0
 
 Name:       cldr-emoji-annotation
-Version:    40
-Release:    2%{?dist}
+Version:    40.0
+Release:    3%{?dist}
 %if 0%{?fedora:1}%{?rhel:0}
 Epoch:      1
 %endif
@@ -14,7 +14,6 @@ License:    Unicode
 URL:        https://unicode.org/cldr
 %if %is_official
 Source0:    https://github.com/unicode-org/cldr/releases/download/%{tag_version}/cldr-common-%{version}.zip
-Source1:    https://raw.githubusercontent.com/unicode-org/cldr/%{tag_version}/README.md#/cldr-README.md
 %else
 Source0:    https://github.com/unicode-org/cldr/archive/refs/tags/%{tag_version}.zip#/cldr-%{tag_version}.zip
 %endif
@@ -50,7 +49,6 @@ when building programs that use cldr-emoji-annotations.
 %prep
 %if %is_official
 %autosetup -c -n cldr-%{tag_version}
-cp %SOURCE1 README.md
 %else
 %autosetup -n cldr-%{tag_version}
 %endif
@@ -107,8 +105,13 @@ done
 
 
 %files
-%doc README.md readme.html
+%if %is_official
+%doc README-common.md
+%license LICENSE.txt
+%else
+%doc README.md
 %license unicode-license.txt
+%endif
 %{_datadir}/unicode/cldr/common/annotations
 %{_datadir}/unicode/cldr/common/annotationsDerived
 
@@ -122,6 +125,9 @@ done
 %{_datadir}/pkgconfig/*.pc
 
 %changelog
+* Fri Oct 29 2021 Takao Fujiwara <tfujiwar@gmail.com> - 1:40.0-3
+- Use cldr-common-40.0.zip since DTD files are resolved
+
 * Fri Oct 29 2021 Takao Fujiwara <tfujiwar@gmail.com> - 1:40-2
 - Bump to release-40
 
diff --git a/sources b/sources
index b795860..30002af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cldr-release-40.zip) = 806319d44f98ae9fcfb8b4556ac14dc3fd30241f5ff805a20ac3998630e7c2837b38af52f2fedb55acb4b6fd5ccab1330c63475027408dae719b9be7161991a1
+SHA512 (cldr-common-40.0.zip) = b45ea381002210cf5963a2ba52fa45ee4e9b1e80ae1180bcecf61f431d64e4e0faba700b3d56a96a33355deab3abdb8bcbae9222b60a8ca85536476718175645