diff --git a/requirements.txt b/requirements.txt
index 50eb2a2cb3ba0f0c8587a38727390f916d6651a6..67248e36477aee3a7f56c33e64f1ad46fd6aa880 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,9 @@
 Django==1.4.5
 South==0.7.3
-amqplib==1.0.2
 anyjson==0.3.1
-celery==2.3.3
+celery==3.0.16
 distribute==0.6.24
-django-celery==2.3.3
+django-celery==3.0.11
 django-picklefield==0.1.9
 kombu==2.5.7
 psycopg2==2.4.1
diff --git a/settings.py b/settings.py
index 1189078e3c85565079c2351ba70fffa21e183ffa..5904a89eb4b44dc0c13e486638f86740b99f7412 100644
--- a/settings.py
+++ b/settings.py
@@ -85,7 +85,7 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     ## needed for queues
     'djcelery',
-    'kombu',
+    'kombu.transport.django',
     ## needed for schema migration
     'south',
     ## HELIOS stuff
@@ -185,11 +185,14 @@ logging.basicConfig(
     format = '%(asctime)s %(levelname)s %(message)s'
 )
 
+# BROKER_URL = "django://"
+
 # set up django-celery
+BROKER_BACKEND = "djkombu.transport.DatabaseTransport"
+CELERY_RESULT_DBURI = DATABASES['default']
 import djcelery
 djcelery.setup_loader()
-BROKER_BACKEND = "kombu.transport.django"
-CELERY_RESULT_DBURI = DATABASES['default']
+
 
 # for testing
 #CELERY_ALWAYS_EAGER = True