diff --git a/app/lib/frontend/templates.dart b/app/lib/frontend/templates.dart
index 94bf4ba782..8665cbce47 100644
--- a/app/lib/frontend/templates.dart
+++ b/app/lib/frontend/templates.dart
@@ -368,6 +368,14 @@ class TemplateService {
       tabs.first['active'] = '-active';
     }
     final analysisStatus = analysis?.analysisStatus ?? extract?.analysisStatus;
+    String documentationUrl = selectedVersion.documentation;
+    if (documentationUrl != null &&
+        (documentationUrl.startsWith('https://www.dartdocs.org/') ||
+            documentationUrl.startsWith('http://www.dartdocs.org/') ||
+            documentationUrl.startsWith('https://pub.dartlang.org/') ||
+            documentationUrl.startsWith('http://pub.dartlang.org/'))) {
+      documentationUrl = null;
+    }
 
     final values = {
       'package': {
@@ -394,6 +402,7 @@ class TemplateService {
         'authors_html':
             _getAuthorsHtml(selectedVersion.pubspec.getAllAuthors()),
         'homepage': selectedVersion.homepage,
+        'documentation': documentationUrl,
         'dartdocs_url': selectedVersion.dartdocsUrl,
         // TODO: make this 'Uploaders' if Package.uploaders is > 1?!
         'uploaders_title': 'Uploader',
diff --git a/app/test/frontend/golden/pkg_show_page.html b/app/test/frontend/golden/pkg_show_page.html
index 58c39bae0e..478331642d 100644
--- a/app/test/frontend/golden/pkg_show_page.html
+++ b/app/test/frontend/golden/pkg_show_page.html
@@ -291,7 +291,8 @@ <h4>Dependencies</h4>
     <h3 class="title">About</h3>
       <p>my package description</p>
       <p>
-          <a class="link" href="http://hans.juergen.com">Homepage</a>,
+          <a class="link" href="http://hans.juergen.com">Homepage</a><br/>
+          
           <a class="link" href="https://pub.dartlang.org/documentation/foobar_pkg/0.1.1+5/">API Docs</a>
       </p>
 
diff --git a/app/test/frontend/golden/pkg_show_page_discontinued.html b/app/test/frontend/golden/pkg_show_page_discontinued.html
index 8a40de052c..8a7f551922 100644
--- a/app/test/frontend/golden/pkg_show_page_discontinued.html
+++ b/app/test/frontend/golden/pkg_show_page_discontinued.html
@@ -180,7 +180,8 @@ <h2>Analysis</h2>
     <h3 class="title">About</h3>
       <p>my package description</p>
       <p>
-          <a class="link" href="http://hans.juergen.com">Homepage</a>,
+          <a class="link" href="http://hans.juergen.com">Homepage</a><br/>
+          
           <a class="link" href="https://pub.dartlang.org/documentation/foobar_pkg/0.1.1+5/">API Docs</a>
       </p>
 
diff --git a/app/test/frontend/golden/pkg_show_page_flutter_plugin.html b/app/test/frontend/golden/pkg_show_page_flutter_plugin.html
index fea601b402..c7f76dcb15 100644
--- a/app/test/frontend/golden/pkg_show_page_flutter_plugin.html
+++ b/app/test/frontend/golden/pkg_show_page_flutter_plugin.html
@@ -249,7 +249,8 @@ <h4>Platforms</h4>
     <h3 class="title">About</h3>
       <p>my package description</p>
       <p>
-          <a class="link" href="http://hans.juergen.com">Homepage</a>,
+          <a class="link" href="http://hans.juergen.com">Homepage</a><br/>
+          
           <a class="link" href="https://pub.dartlang.org/documentation/foobar_pkg/0.1.1+5/">API Docs</a>
       </p>
 
diff --git a/app/test/frontend/golden/pkg_show_page_outdated.html b/app/test/frontend/golden/pkg_show_page_outdated.html
index 12141af40e..6fd1249199 100644
--- a/app/test/frontend/golden/pkg_show_page_outdated.html
+++ b/app/test/frontend/golden/pkg_show_page_outdated.html
@@ -184,7 +184,8 @@ <h2>Analysis</h2>
     <h3 class="title">About</h3>
       <p>my package description</p>
       <p>
-          <a class="link" href="http://hans.juergen.com">Homepage</a>,
+          <a class="link" href="http://hans.juergen.com">Homepage</a><br/>
+          
           <a class="link" href="https://pub.dartlang.org/documentation/foobar_pkg/0.1.1+5/">API Docs</a>
       </p>
 
diff --git a/app/test/frontend/golden/pkg_show_version_page.html b/app/test/frontend/golden/pkg_show_version_page.html
index 915ab8a36f..afe58e198a 100644
--- a/app/test/frontend/golden/pkg_show_version_page.html
+++ b/app/test/frontend/golden/pkg_show_version_page.html
@@ -293,7 +293,8 @@ <h4>Dependencies</h4>
     <h3 class="title">About</h3>
       <p>my package description</p>
       <p>
-          <a class="link" href="http://hans.juergen.com">Homepage</a>,
+          <a class="link" href="http://hans.juergen.com">Homepage</a><br/>
+          
           <a class="link" href="https://pub.dartlang.org/documentation/foobar_pkg/0.1.1+5/">API Docs</a>
       </p>
 
diff --git a/app/views/pkg/show.mustache b/app/views/pkg/show.mustache
index fe8755f2e1..7833177ede 100644
--- a/app/views/pkg/show.mustache
+++ b/app/views/pkg/show.mustache
@@ -90,7 +90,8 @@ import 'package:{{package}}/{{library}}';
     {{#package.description}}
       <p>{{package.description}}</p>
       <p>
-          {{#package.homepage}}<a class="link" href="{{& package.homepage}}">Homepage</a>,{{/package.homepage}}
+          {{#package.homepage}}<a class="link" href="{{& package.homepage}}">Homepage</a><br/>{{/package.homepage}}
+          {{#package.documentation}}<a class="link" href="{{& package.documentation}}">Documentation</a><br/>{{/package.documentation}}
           <a class="link" href="{{& package.dartdocs_url}}">API Docs</a>
       </p>
     {{/package.description}}