diff --git a/assets/images/docs.png b/assets/images/docs.png
index 298f1fd7..286f700f 100644
Binary files a/assets/images/docs.png and b/assets/images/docs.png differ
diff --git a/assets/images/docs@2x.png b/assets/images/docs@2x.png
index f34938b4..407b7648 100644
Binary files a/assets/images/docs@2x.png and b/assets/images/docs@2x.png differ
diff --git a/assets/javascripts/news.json b/assets/javascripts/news.json
index 09b2c1d2..8f1b4f41 100644
--- a/assets/javascripts/news.json
+++ b/assets/javascripts/news.json
@@ -1,5 +1,8 @@
 [
   [
+    "2016-09-05",
+    "New documentation: <a href=\"/bottle/\">Bottle</a>"
+  ], [
     "2016-08-07",
     "New documentation: <a href=\"/docker/\">Docker</a>"
   ], [
diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee
index 3f1c6927..b0b45219 100644
--- a/assets/javascripts/templates/pages/about_tmpl.coffee
+++ b/assets/javascripts/templates/pages/about_tmpl.coffee
@@ -109,6 +109,11 @@ credits = [
     '2011-2016 Twitter, Inc.',
     'CC BY',
     'https://creativecommons.org/licenses/by/3.0/'
+  ], [
+    'Bottle',
+    '2016 Marcel Hellkamp',
+    'MIT',
+    'https://raw.githubusercontent.com/bottlepy/bottle/master/LICENSE'
   ], [
     'Bower',
     '2016 Bower contributors',
diff --git a/assets/stylesheets/global/_icons.scss b/assets/stylesheets/global/_icons.scss
index 9eaa8673..59e9be57 100644
--- a/assets/stylesheets/global/_icons.scss
+++ b/assets/stylesheets/global/_icons.scss
@@ -116,6 +116,7 @@
 ._icon-socketio:before      { background-position: -2rem -6rem; }
 ._icon-modernizr:before     { background-position: -3rem -6rem; }
 ._icon-bower:before         { background-position: -4rem -6rem; }
+._icon-bottle:before        { background-position: 0 -7rem; }
 ._icon-docker:before        { background-position: -1rem -7rem; }
 ._icon-cakephp:before       { background-position: -2rem -7rem; }
 ._icon-lua:before           { background-position: -3rem -7rem; @extend %darkIconFix !optional; }
diff --git a/lib/docs/filters/bottle/entries.rb b/lib/docs/filters/bottle/entries.rb
index 9efd32b6..904846cd 100644
--- a/lib/docs/filters/bottle/entries.rb
+++ b/lib/docs/filters/bottle/entries.rb
@@ -1,16 +1,6 @@
 module Docs
   class Bottle
     class EntriesFilter < Docs::EntriesFilter
-      TYPES = {
-        'routing' => 'Request Routing',
-        'stpl' => 'SimpleTemplate Engine',
-        'api'  => 'API Reference',
-
-        'tutorial_app' => 'Tutorial',
-        'async' => 'Primer to Asynchronous Applications',
-        'faq' => 'Frequently Asked Questions'
-      }
-
       def get_name
         name = at_css('h1').content.strip
         name.remove! "\u{00B6}"
@@ -18,15 +8,18 @@ module Docs
       end
 
       def get_type
-        type = slug.split('/').first
-
-        if TYPES.key?(type)
-          type = TYPES[type]
+        case slug
+        when 'api'
+          'Reference'
+        when 'configuration'
+          'Reference: Configuration'
+        when 'stpl'
+          'Reference: SimpleTemplate'
+        when 'plugindev'
+          'Reference: Plugin'
         else
-          type = type.capitalize
+          'Manual'
         end
-
-        type
       end
 
       def additional_entries
diff --git a/lib/docs/scrapers/bottle.rb b/lib/docs/scrapers/bottle.rb
index cf038d82..1d52c6b3 100644
--- a/lib/docs/scrapers/bottle.rb
+++ b/lib/docs/scrapers/bottle.rb
@@ -1,8 +1,7 @@
 module Docs
-  class Bottle < FileScraper
+  class Bottle < UrlScraper
     self.type = 'sphinx'
-    self.dir = ""
-    self.root_path = "index.html"
+    self.root_path = 'index.html'
     self.links = {
       home: 'https://bottle.org/',
       code: 'https://github.com/bottlepy/bottle'
@@ -12,24 +11,19 @@ module Docs
 
     options[:container] = '.body'
 
-    options[:skip] = %w(
-      changelog.html
-      development.html
-      plugindev.html
-      _modules/bottle.html
-    )
+    options[:skip] = %w(changelog.html development.html _modules/bottle.html)
 
     options[:attribution] = <<-HTML
-      &copy; 2009&ndash;2016, Marcel Hellkamp<br>
-      Licensed under the MIT License.<br>
+      &copy; 2016 Marcel Hellkamp<br>
+      Licensed under the MIT License.
     HTML
 
-    version '0.12' do # http://bottlepy.org/docs/0.12/bottle-docs.zip
+    version '0.12' do
       self.release = '0.12'
       self.base_url = "http://bottlepy.org/docs/#{self.version}/"
     end
 
-    version '0.11' do # http://bottlepy.org/docs/0.11/bottle-docs.zip
+    version '0.11' do
       self.release = '0.11'
       self.base_url = "http://bottlepy.org/docs/#{self.version}/"
     end
diff --git a/public/icons/docs/bottle/16.png b/public/icons/docs/bottle/16.png
new file mode 100644
index 00000000..4bcb28a8
Binary files /dev/null and b/public/icons/docs/bottle/16.png differ
diff --git a/public/icons/docs/bottle/16@2x.png b/public/icons/docs/bottle/16@2x.png
new file mode 100644
index 00000000..274a402f
Binary files /dev/null and b/public/icons/docs/bottle/16@2x.png differ
diff --git a/public/icons/docs/bottle/SOURCE b/public/icons/docs/bottle/SOURCE
new file mode 100644
index 00000000..82aeab36
--- /dev/null
+++ b/public/icons/docs/bottle/SOURCE
@@ -0,0 +1,2 @@
+https://raw.githubusercontent.com/bottlepy/bottlepy.org/master/sphinx/static/logo_icon.png
+https://github.com/bottlepy/bottle/issues/886