diff --git a/fabfile.py b/fabfile.py
index 1d8e88a..80dc564 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -92,9 +92,7 @@ def setup_rabbitmq():
     sudo('rabbitmqctl add_vhost %s' % env.vhost, shell=False)
     sudo('rabbitmqctl set_permissions -p %s %s ".*" ".*" ".*"' % (env.vhost, env.user), shell=False)
 
-    with cd('%(path)s/dreddit-auth/' % env):
-        put('brokersettings.py', '.')
-
+    put('brokersettings.py', '%(path)s/dreddit-auth/')
     os.unlink('brokersettings.py')
 
 def deploy_repo():
diff --git a/settings.py b/settings.py
index 20072c9..e3d37f2 100755
--- a/settings.py
+++ b/settings.py
@@ -17,7 +17,7 @@ MANAGERS = ADMINS
 from dbsettings import *
 
 # Import the Broker settings
-from brokersettings.py import *
+from brokersettings import *
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name