diff --git a/pinry/urls.py b/pinry/urls.py
index 4d37482..2b044ba 100644
--- a/pinry/urls.py
+++ b/pinry/urls.py
@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.conf.urls import patterns, include, url
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
@@ -6,4 +7,11 @@ urlpatterns = patterns('',
                        url(r'', include('pinry.core.urls', namespace='core')),
                        url(r'', include('pinry.users.urls', namespace='users')),
 )
-urlpatterns += staticfiles_urlpatterns()
+
+if settings.DEBUG:
+    urlpatterns += staticfiles_urlpatterns()
+    urlpatterns += patterns('',
+                            url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+                                'document_root': settings.MEDIA_ROOT,
+                                }),
+                            )
\ No newline at end of file