diff --git a/CHANGELOG b/CHANGELOG
index 3e7fb42..45f8ed9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,8 @@ future releases, check `milestones`_ and :doc:`/about/vision`.
   deprecated but kept for backward compatibility as an alias for
   ``TextIteratorIO``.
 
+- Bugfix #92 - Run demo using ``make demo runserver`` (was broken).
+
 - Feature #99 - Tox runs project's tests with Python 2.7, 3.3 and 3.4, and with
   Django 1.5 to 1.8.
 
diff --git a/Makefile b/Makefile
index 1a9b8bd..e1b1888 100644
--- a/Makefile
+++ b/Makefile
@@ -75,12 +75,14 @@ readme:
 #: demo - Setup demo project.
 .PHONY: demo
 demo:
+	pip install -e .
+	pip install -e demo
 	demo migrate --noinput
 	# Install fixtures.
-	mkdir -p var/media
-	cp -r demo/demoproject/fixtures var/media/object
-	cp -r demo/demoproject/fixtures var/media/object-other
-	cp -r demo/demoproject/fixtures var/media/nginx
+	mkdir -p var/media/object var/media/object-other/ var/media/nginx
+	cp -r demo/demoproject/fixtures/* var/media/object/
+	cp -r demo/demoproject/fixtures/* var/media/object-other/
+	cp -r demo/demoproject/fixtures/* var/media/nginx/
 	demo loaddata demo.json
 
 
diff --git a/demo/demoproject/fixtures/demo.json b/demo/demoproject/fixtures/demo.json
index ec4e68d..0424b6c 100644
--- a/demo/demoproject/fixtures/demo.json
+++ b/demo/demoproject/fixtures/demo.json
@@ -4,7 +4,7 @@
         "model": "object.document", 
         "fields": {
             "slug": "hello-world", 
-            "file": "document/hello-world.txt"
+            "file": "object/hello-world.txt"
         }
     }
 ]
diff --git a/demo/demoproject/templates/home.html b/demo/demoproject/templates/home.html
index f3d9588..b46d3cd 100644
--- a/demo/demoproject/templates/home.html
+++ b/demo/demoproject/templates/home.html
@@ -11,6 +11,9 @@
         <p>In the following views, Django streams the files, no optimization
            has been setup.</p>
         <ul>
+            <li>
+                <a href="{% url 'object:default_file' 'hello-world' %}">object:default_file</a>
+            </li>
         </ul>
 
         <h2>Optimized downloads</h2>