diff --git a/Makefile b/Makefile
index 4b805ed..5bfd897 100644
--- a/Makefile
+++ b/Makefile
@@ -65,12 +65,13 @@ sphinx:
 documentation: apidoc sphinx
 
 
-runserver:
+demo: develop
+	mkdir -p var/media/document
+	bin/demo syncdb --noinput
+	cp $(ROOT_DIR)/demo/demoproject/download/fixtures/hello-world.txt var/media/document/
+	bin/demo loaddata $(ROOT_DIR)/demo/demoproject/download/fixtures/demo.json
 	bin/demo runserver
 
 
-demo: develop runserver
-
-
 release:
 	bin/fullrelease
diff --git a/demo/demoproject/download/fixtures/demo.json b/demo/demoproject/download/fixtures/demo.json
new file mode 100644
index 0000000..43fc8fd
--- /dev/null
+++ b/demo/demoproject/download/fixtures/demo.json
@@ -0,0 +1,10 @@
+[
+    {
+        "pk": 1, 
+        "model": "download.document", 
+        "fields": {
+            "slug": "hello-world", 
+            "file": "document/hello-world.txt"
+        }
+    }
+]
diff --git a/demo/demoproject/settings.py b/demo/demoproject/settings.py
index 315091c..9328293 100755
--- a/demo/demoproject/settings.py
+++ b/demo/demoproject/settings.py
@@ -125,6 +125,7 @@ INSTALLED_APPS = (
     # 'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
+    'demoproject',
     'demoproject.download',
     'django_nose',
 )
diff --git a/demo/demoproject/templates/home.html b/demo/demoproject/templates/home.html
new file mode 100644
index 0000000..10caf22
--- /dev/null
+++ b/demo/demoproject/templates/home.html
@@ -0,0 +1,15 @@
+{% load url from future %}
+<html>
+	<head>
+        <title>django-downloadview demo</title>
+	</head>
+	<body>
+        <h1>Welcome to django-downloadview demo!</h1>
+		<p>Here are some demo links. Browse the code to see how they are implemented</p>
+		<ul>
+            <li><a href="{% url 'download_hello_world' %}">DownloadView</a></li>
+            <li><a href="{% url 'download_document' 'hello-world' %}">ObjectDownloadView</a></li>
+            <li><a href="{% url 'download_document_nginx' 'hello-world' %}">ObjectDownloadView decorated with nginx X-Accel-Redirect</a> (better if served behind nginx)</li>
+        </ul>
+    </body>
+</html>
diff --git a/demo/demoproject/urls.py b/demo/demoproject/urls.py
index 401ab5f..2057628 100755
--- a/demo/demoproject/urls.py
+++ b/demo/demoproject/urls.py
@@ -1,6 +1,11 @@
 from django.conf.urls import patterns, include, url
+from django.views.generic import TemplateView
+
+
+home = TemplateView.as_view(template_name='home.html')
 
 
 urlpatterns = patterns('',
     url(r'^download/', include('demoproject.download.urls')),
+    url(r'', home, name='home')
 )
