diff --git a/doc/org/.dir-locals.el.in b/doc/org/.dir-locals.el.in
index 4525081a6..5925821ba 100644
--- a/doc/org/.dir-locals.el.in
+++ b/doc/org/.dir-locals.el.in
@@ -34,9 +34,9 @@
 		   :recursive t
 		   :publishing-function org-publish-org-to-html
 		   ; Org 8
-		   :html-head "<link rel=\"stylesheet\" type=\"text/css\" href=\"spot.css\" />"
+		   :html-head "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n<link rel=\"stylesheet\" type=\"text/css\" href=\"syntax.css\" />\n<link rel=\"stylesheet\" type=\"text/css\" href=\"spot.css\" />"
 		   ; Org 7
-		   :style "<link rel=\"stylesheet\" type=\"text/css\" href=\"spot.css\" />"
+		   :style "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n<link rel=\"stylesheet\" type=\"text/css\" href=\"syntax.css\" />\n<link rel=\"stylesheet\" type=\"text/css\" href=\"spot.css\" />"
 		   :auto-preamble t)
 		  ("spot-static"
 		   :base-directory "."
diff --git a/doc/org/init.el.in b/doc/org/init.el.in
index 55d472968..e0ba04502 100644
--- a/doc/org/init.el.in
+++ b/doc/org/init.el.in
@@ -52,9 +52,9 @@
 	,(if (require 'org-publish nil t) 'org-publish-org-to-html ; Org 7
 	   'org-html-publish-to-html)                              ; Org 8
 	; Org 8
-	:html-head "<link rel=\"stylesheet\" type=\"text/css\" href=\"syntax.css\" />\n<link rel=\"stylesheet\" type=\"text/css\" href=\"spot.css\" />"
+	:html-head "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n<link rel=\"stylesheet\" type=\"text/css\" href=\"syntax.css\" />\n<link rel=\"stylesheet\" type=\"text/css\" href=\"spot.css\" />"
 	; Org 7
-	:style "\n<link rel=\"stylesheet\" type=\"text/css\" href=\"syntax.css\" />\n<link rel=\"stylesheet\" type=\"text/css\" href=\"spot.css\" />"
+	:style "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n<link rel=\"stylesheet\" type=\"text/css\" href=\"syntax.css\" />\n<link rel=\"stylesheet\" type=\"text/css\" href=\"spot.css\" />"
 	:auto-preamble t)
        ("spot-static"
 	:base-directory "@abs_top_srcdir@/doc/org/"
diff --git a/doc/org/spot.css b/doc/org/spot.css
index 20b49cd05..b8faa0e91 100644
--- a/doc/org/spot.css
+++ b/doc/org/spot.css
@@ -33,11 +33,13 @@
 
   /* TOC inspired by http://jashkenas.github.com/coffee-script */
   #table-of-contents {
-    font-size: 10pt;
+    font-size: 80%;
+    max-width: 30em;
     position: fixed;
     right: 0em;
     top: 0em;
-    padding-right: 8pt;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
     -webkit-box-shadow: 0 0 1em #777777;
     -moz-box-shadow: 0 0 1em #777777;
     -webkit-border-bottom-left-radius: 5px;
@@ -46,21 +48,23 @@
     /* ensure doesn't flow off the screen when expanded */
     max-height: 80%;
     overflow: auto; }
-    #table-of-contents h2 {
-      font-size: 10pt;
-      max-width: 8em;
-      font-weight: normal;
-      padding-left: 0.5em;
-      padding-left: 0.5em;
-      padding-top: 0.05em;
-      padding-bottom: 0.05em; }
-    #table-of-contents #text-table-of-contents {
-      display: none;
-      text-align: left; }
-    #table-of-contents:hover #text-table-of-contents {
-      display: block;
-      padding: 0.5em;
-      margin-top: -1.5em; }
+  #table-of-contents ul {
+      padding-left: 1em;
+  }
+  #table-of-contents h2 {
+    font-size: 100%;
+    font-weight: normal;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+    padding-top: 0.05em;
+    padding-bottom: 0.05em; }
+  #table-of-contents #text-table-of-contents {
+    display: none;
+    text-align: left; }
+  #table-of-contents:hover #text-table-of-contents {
+    display: block;
+    padding: 0.5em;
+    margin-top: -1.5em; }
 
   .rss_box {}
   .rss_title, rss_title a {}