diff --git a/Makefile b/Makefile
index 81ad532b9..93b8da5e5 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,12 @@ apache-install:
 	install -D -m644 share/apache2/plinth.conf $(DESTDIR)/etc/apache2/sites-available/plinth.conf
 apache-config: apache-install apache-ssl
 	a2ensite plinth
+	service apache2 reload
 
 apache-ssl:
 	make-ssl-cert generate-default-snakeoil
 	a2enmod ssl
+	a2enmod rewrite
+	a2enmod proxy
+	a2enmod proxy_http
+	service apache2 restart
diff --git a/share/apache2/plinth.conf b/share/apache2/plinth.conf
index dff0f7d93..f3054aaaf 100644
--- a/share/apache2/plinth.conf
+++ b/share/apache2/plinth.conf
@@ -22,7 +22,7 @@
 
     ## Use this rule to hang plinth off of plinth.(servername)
     ## The DocumentRoot is set by fabric
-    DocumentRoot /dev/null
+    DocumentRoot /home/fbx/plinth/static
     ServerName plinth
     ServerAlias plinth.*
     ProxyPreserveHost on
diff --git a/templates/base.tmpl b/templates/base.tmpl
index 2576605c9..8a162888f 100644
--- a/templates/base.tmpl
+++ b/templates/base.tmpl
@@ -14,11 +14,11 @@
 <!-- the "no-js" class is for Modernizr -->
 <head>
 	<meta charset="utf-8" />
-	
+
 	<!-- Always force latest IE rendering engine and Chrome Frame -->
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-	
-	<!--  Mobile Viewport Fix http://j.mp/mobileviewport & http://davidbcalhoun.com/2010/viewport-metatag 
+
+	<!--  Mobile Viewport Fix http://j.mp/mobileviewport & http://davidbcalhoun.com/2010/viewport-metatag
 	device-width : Occupy full width of the screen in its current orientation
 	initial-scale = 1.0 retains dimensions instead of zooming out if page height > device height
 	maximum-scale = 1.0 retains dimensions instead of zooming in if page width < device width
@@ -37,7 +37,7 @@
 
 	<!-- This is the traditional favicon. Size: 16x16 or 32x32, transparency is OK -->
 	<link rel="shortcut icon" href="$basehref/static/theme/img/favicon.ico" />
-	
+
 	<!-- The is the icon for iOS's Web Clip. Size: 57x57 for older iPhones, 72x72 for iPads, 114x114 for iPhone4
 	- To prevent iOS from applying its styles to the icon name it thusly: apple-touch-icon-precomposed.png
 	- Transparency is not recommended (iOS will put a black BG behind the icon) -->
@@ -102,13 +102,11 @@
 	<script type="text/javascript">
 	  <!--
 	    $onload
-	  // --> 
+	  // -->
 	</script>
 </head>
 <body onload="javascript:onload_handler();">
-<!--[if lt IE 7]><p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</p><![endif]-->
-<!-- ^ FreedomBox needs a better version of "Browse Happy", with freedom and privacy-respecting browsers only -->
-
+<!--[if lt IE 7]><p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://mozilla.org/firefox">Upgrade to a modern version of Firefox</a> to experience this site.</p><![endif]-->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container-fluid">
@@ -172,7 +170,7 @@
 		</p>
 		<p>Current page: $current_url</p>
 		<p>
-		
+
 		</p>
 		#end block footer_block</p>
       </footer>
