diff --git a/data/etc/apache2/conf-available/diaspora-plinth.conf b/data/etc/apache2/conf-available/diaspora-plinth.conf
index a59aa8a18..3a22aaf26 100644
--- a/data/etc/apache2/conf-available/diaspora-plinth.conf
+++ b/data/etc/apache2/conf-available/diaspora-plinth.conf
@@ -1,10 +1,17 @@
-<Location "/diaspora">
-        ProxyPass "unix:/var/run/diaspora/diaspora.sock|http://localhost"
-</Location>
+<VirtualHost diaspora.localhost>
+    ServerName diaspora.localhost
 
-# TODO  This is temporary. Remove this
-<Location "/podmin">
-        ProxyPass "unix:/var/run/diaspora/diaspora.sock|http://freedombox/podmin"
-</Location>
+    DocumentRoot "/var/lib/diaspora/public/"
 
-Alias "/assets" "/usr/share/diaspora/public/assets"
\ No newline at end of file
+    <Location "/">
+        ProxyPass "unix:/var/run/diaspora/diaspora.sock|http://localhost/"
+    </Location>
+
+    <Location "/assets">
+        ProxyPass !
+    </Location>
+
+    <Directory /var/lib/diaspora/public/>
+        Require all granted
+    </Directory>
+</VirtualHost>
\ No newline at end of file