diff --git a/README.md b/README.md
index 06013eb..3775f3b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # URI
 
 [![CI](https://github.com/ruby/uri/actions/workflows/test.yml/badge.svg)](https://github.com/ruby/uri/actions/workflows/test.yml)
+[![Yard Docs](https://img.shields.io/badge/docs-exist-blue.svg)](https://ruby.github.io/uri/)
 
 URI is a module providing classes to handle Uniform Resource Identifiers [RFC2396](http://tools.ietf.org/html/rfc2396).
 
diff --git a/uri.gemspec b/uri.gemspec
index 584a4fa..57c3239 100644
--- a/uri.gemspec
+++ b/uri.gemspec
@@ -12,13 +12,21 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{URI is a module providing classes to handle Uniform Resource Identifiers}
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/ruby/uri"
+
+  github_link        = "https://github.com/ruby/uri"
+
+  spec.homepage      = github_link
   spec.licenses      = ["Ruby", "BSD-2-Clause"]
 
   spec.required_ruby_version = '>= 2.4'
 
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata = {
+    "bug_tracker_uri" => "#{github_link}/issues",
+    "changelog_uri" => "#{github_link}/releases",
+    "documentation_uri" => "https://ruby.github.io/uri/",
+    "homepage_uri" => spec.homepage,
+    "source_code_uri" => github_link
+  }
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.