diff --git a/CHANGELOG b/CHANGELOG
index 8834a54fa..a421c1290 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 
 x January 2013: mitmproxy 0.9:
 
+    * Upstream certs mode is now the default.
+
     * Add a WSGI container that lets you host in-proxy web applications.
     
     * Full transparent proxy support for Linux and OSX.
diff --git a/doc-src/anticache.html b/doc-src/features/anticache.html
similarity index 100%
rename from doc-src/anticache.html
rename to doc-src/features/anticache.html
diff --git a/doc-src/clientreplay.html b/doc-src/features/clientreplay.html
similarity index 100%
rename from doc-src/clientreplay.html
rename to doc-src/features/clientreplay.html
diff --git a/doc-src/filters.html b/doc-src/features/filters.html
similarity index 100%
rename from doc-src/filters.html
rename to doc-src/features/filters.html
diff --git a/doc-src/features/index.py b/doc-src/features/index.py
new file mode 100644
index 000000000..f7efc23ae
--- /dev/null
+++ b/doc-src/features/index.py
@@ -0,0 +1,14 @@
+from countershape import Page
+
+pages = [
+    Page("anticache.html", "Anticache"),
+    Page("clientreplay.html", "Client-side replay"),
+    Page("filters.html", "Filter expressions"),
+    Page("setheaders.html", "Set Headers"),
+    Page("serverreplay.html", "Server-side replay"),
+    Page("sticky.html", "Sticky cookies and auth"),
+    Page("proxyauth.html", "Proxy Authentication"),
+    Page("replacements.html", "Replacements"),
+    Page("reverseproxy.html", "Reverse proxy mode"),
+    Page("upstreamcerts.html", "Upstream Certs"),
+]
diff --git a/doc-src/proxyauth.html b/doc-src/features/proxyauth.html
similarity index 100%
rename from doc-src/proxyauth.html
rename to doc-src/features/proxyauth.html
diff --git a/doc-src/replacements.html b/doc-src/features/replacements.html
similarity index 100%
rename from doc-src/replacements.html
rename to doc-src/features/replacements.html
diff --git a/doc-src/reverseproxy.html b/doc-src/features/reverseproxy.html
similarity index 100%
rename from doc-src/reverseproxy.html
rename to doc-src/features/reverseproxy.html
diff --git a/doc-src/serverreplay.html b/doc-src/features/serverreplay.html
similarity index 100%
rename from doc-src/serverreplay.html
rename to doc-src/features/serverreplay.html
diff --git a/doc-src/setheaders.html b/doc-src/features/setheaders.html
similarity index 100%
rename from doc-src/setheaders.html
rename to doc-src/features/setheaders.html
diff --git a/doc-src/sticky.html b/doc-src/features/sticky.html
similarity index 100%
rename from doc-src/sticky.html
rename to doc-src/features/sticky.html
diff --git a/doc-src/upstreamcerts.html b/doc-src/features/upstreamcerts.html
similarity index 100%
rename from doc-src/upstreamcerts.html
rename to doc-src/features/upstreamcerts.html
diff --git a/doc-src/index.py b/doc-src/index.py
index f2a07db8e..01b9363d2 100644
--- a/doc-src/index.py
+++ b/doc-src/index.py
@@ -66,17 +66,6 @@ pages = [
     Page("mitmproxy.html", "mitmproxy"),
     Page("mitmdump.html", "mitmdump"),
 
-    Page("anticache.html", "Anticache"),
-    Page("clientreplay.html", "Client-side replay"),
-    Page("filters.html", "Filter expressions"),
-    Page("setheaders.html", "Set Headers"),
-    Page("serverreplay.html", "Server-side replay"),
-    Page("sticky.html", "Sticky cookies and auth"),
-    Page("proxyauth.html", "Proxy Authentication"),
-    Page("replacements.html", "Replacements"),
-    Page("reverseproxy.html", "Reverse proxy mode"),
-    Page("upstreamcerts.html", "Upstream Certs"),
-
     Page("ssl.html", "Overview"),
     Page("transparent.html", "Overview"),
     Directory("certinstall"),