diff --git a/.gitignore b/.gitignore
index af90668c8981f099882f3d5664e5887e34563e1d..2ed22b1cd3fb698bab77ac544544e1df0958d708 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,17 +26,12 @@ htmlcov
 
 demo/*.db
 demo/*.log
+demo/*.log.*
 demo/*.pid
+demo/media_store.*
 demo/etc
 
-graph/*.svg
-graph/*.png
-graph/*.dot
-
-**/webclient/config.js
-**/webclient/test/coverage/
-**/webclient/test/environment-protractor.js
-
 uploads
 
 .idea/
+media_store/
diff --git a/demo/start.sh b/demo/start.sh
index ce3e292486f119655f9ceedd158caf9961856b2c..bb2248770da122ad71985e9df599da805a36ee48 100755
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -32,7 +32,8 @@ for port in 8080 8081 8082; do
         -D --pid-file "$DIR/$port.pid" \
         --manhole $((port + 1000)) \
         --tls-dh-params-path "demo/demo.tls.dh" \
-		$PARAMS $SYNAPSE_PARAMS
+        --media-store-path "demo/media_store.$port" \
+		$PARAMS $SYNAPSE_PARAMS \
 
     python -m synapse.app.homeserver \
         --config-path "demo/etc/$port.config" \