diff --git a/elasticsearch-dsl.gemspec b/elasticsearch-dsl.gemspec
index 41a5124..a06ebf4 100644
--- a/elasticsearch-dsl.gemspec
+++ b/elasticsearch-dsl.gemspec
@@ -14,9 +14,14 @@ Gem::Specification.new do |s|
   s.email         = ['karel.minarik@elasticsearch.com']
   s.description   = %q{A Ruby DSL builder for Elasticsearch}
   s.summary       = s.description
-  s.homepage      = 'https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-dsl'
+  s.homepage      = 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current/index.html'
   s.license       = 'Apache-2.0'
-
+  s.metadata = {
+    'homepage_uri' => 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current/index.html',
+    'changelog_uri' => 'https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md',
+    'source_code_uri' => 'https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-dsl',
+    'bug_tracker_uri' => 'https://github.com/elastic/elasticsearch-ruby/issues'
+  }
   s.files         = `git ls-files`.split($/)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})