diff --git a/libgsync/drive/__init__.py b/libgsync/drive/__init__.py
index 30fa8be..dcb0f6f 100644
--- a/libgsync/drive/__init__.py
+++ b/libgsync/drive/__init__.py
@@ -345,6 +345,8 @@ def service(self):
 
         if credentials is None:
             credentials = self._obtain_credentials()
+            if storage is not None:
+                storage.put(credentials)
 
         debug("Authenticating")
         import httplib2
diff --git a/setup.py b/setup.py
index 8461cd4..f371225 100755
--- a/setup.py
+++ b/setup.py
@@ -32,9 +32,9 @@
     ],
     install_requires = [
         'docopt >= 0.6.0',
-        'google-api-python-client >= 1.2',
-        'httplib2 >= 0.8',
-        'oauth2client >= 1.1',
+        'google-api-python-client >= 1.2, < 1.5.0',
+        'httplib2 >= 0.8, < 0.16.0',
+        'oauth2client >= 1.1, < 4.0.0',
         'python-dateutil >= 1.5',
         'python-gflags >= 2.0',
         'python-magic >= 0.4.6',