diff --git a/ext/etc/etc.gemspec b/ext/etc/etc.gemspec
index af41091ade..e6ac6323b5 100644
--- a/ext/etc/etc.gemspec
+++ b/ext/etc/etc.gemspec
@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/ruby/etc"
   spec.licenses      = ["Ruby", "BSD-2-Clause"]
 
+  changelogs = Dir.glob("logs/ChangeLog-*[^~]", base: __dir__)
   spec.files         = %w[
     LICENSE.txt
     README.md
@@ -31,14 +32,9 @@ Gem::Specification.new do |spec|
     ext/etc/extconf.rb
     ext/etc/mkconstants.rb
     test/etc/test_etc.rb
-  ]
+  ] + changelogs
   spec.rdoc_options = ["--main", "README.md"]
-  spec.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md",
-    "ChangeLog",
-    *Dir.glob("logs/ChangeLog-*[^~]", base: __dir__),
-  ]
+  spec.extra_rdoc_files = spec.files.grep_v(/\.{rb,[ch]}\z/)
   spec.bindir        = "exe"
   spec.require_paths = ["lib"]
   spec.extensions    = %w{ext/etc/extconf.rb}