diff --git a/lib/settings/defaults.py b/lib/settings/defaults.py
index f8af949a81..887a600211 100644
--- a/lib/settings/defaults.py
+++ b/lib/settings/defaults.py
@@ -105,7 +105,6 @@ MIDDLEWARE_CLASSES += (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'lib.middleware.exceptions.ExceptionMiddleware',
     #'django.middleware.transaction.TransactionMiddleware',
-    #'devserver.middleware.DevServerMiddleware',
 )
 
 TEMPLATE_DIRS = (
@@ -125,10 +124,7 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.staticfiles',
     'lib.main',
-    'lib.web',
     'south',
-# not yet compatible with Django 1.5 unless using version from github
-#   'devserver',
     'rest_framework',
     'django_extensions',
     'djcelery',
@@ -137,6 +133,13 @@ INSTALLED_APPS = (
 
 INTERNAL_IPS = ('127.0.0.1',)
 
+# Use Django-devserver if installed.
+try:
+    import devserver
+    INSTALLED_APPS += ('devserver',)
+except ImportError:
+    pass
+
 DEVSERVER_DEFAULT_ADDR = '0.0.0.0'
 DEVSERVER_DEFAULT_PORT = '8013'
 DEVSERVER_MODULES = (
diff --git a/lib/urls.py b/lib/urls.py
index c3e6b40d57..6718662195 100644
--- a/lib/urls.py
+++ b/lib/urls.py
@@ -29,8 +29,6 @@ views_ProjectsDetail              = views.OrganizationsDetail.as_view()
 
 
 urlpatterns = patterns('',
-    url(r'', include('lib.web.urls')),
-
     # organizations service
     url(r'^api/v1/organizations/$',                            views_OrganizationsList),
     url(r'^api/v1/organizations/(?P<pk>[0-9]+)/$',             views_OrganizationsDetail),
@@ -66,7 +64,6 @@ urlpatterns = patterns('',
     # jobs services
 
     # tags service
-
 )
 
 if 'django.contrib.admin' in settings.INSTALLED_APPS:
diff --git a/lib/web/__init__.py b/lib/web/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/lib/web/models.py b/lib/web/models.py
deleted file mode 100644
index 6b226388e6..0000000000
--- a/lib/web/models.py
+++ /dev/null
@@ -1 +0,0 @@
-# Empty models file.
diff --git a/lib/web/urls.py b/lib/web/urls.py
deleted file mode 100644
index 377bb22b31..0000000000
--- a/lib/web/urls.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.conf.urls import patterns, url
-from lib.web.views import IndexView
-
-urlpatterns = patterns('',
-    url(r'^$', IndexView.as_view(), name='index'),
-)
diff --git a/lib/web/views.py b/lib/web/views.py
deleted file mode 100644
index e6b1bb5802..0000000000
--- a/lib/web/views.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from django.views.generic.base import TemplateView
-
-class IndexView(TemplateView):
-    template_name = 'index.html'
diff --git a/requirements.txt b/requirements.txt
index f25c85455a..4998782ca7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 Django==1.5
 django-celery==3.0.11
-django-devserver==0.4.0
+django-devserver==0.5.0
 django-extensions==1.1.1
 django-jsonfield==0.9.2
 ipython==0.13.1