diff --git a/apiclient/contrib/buzz/future.json b/apiclient/contrib/buzz/future.json
index 621ee52..88abf31 100644
--- a/apiclient/contrib/buzz/future.json
+++ b/apiclient/contrib/buzz/future.json
@@ -3,6 +3,59 @@
     "buzz": {
       "v1": {
         "baseUrl": "https://www.googleapis.com/", 
+        "auth": {
+          "request": {
+            "url": "https://www.google.com/accounts/OAuthGetRequestToken",
+            "parameters": {
+              "xoauth_displayname": {
+                "parameterType": "query",
+                "required": false
+              },
+              "domain": {
+                "parameterType": "query",
+                "required": true
+              },
+              "scope": {
+                "parameterType": "query",
+                "required": true
+              }
+            }
+          },
+          "authorize": {
+            "url": "https://www.google.com/buzz/api/auth/OAuthAuthorizeToken",
+            "parameters": {
+              "oauth_token": {
+                "parameterType": "query",
+                "required": true
+              },
+              "iconUrl": {
+                "parameterType": "query",
+                "required": false
+              },
+              "domain": {
+                "parameterType": "query",
+                "required": true
+              },
+              "scope": {
+                "parameterType": "query",
+                "required": true
+              }
+            }
+          },
+          "access": {
+            "url": "https://www.google.com/accounts/OAuthGetAccessToken",
+            "parameters": {
+              "domain": {
+                "parameterType": "query",
+                "required": true
+              },
+              "scope": {
+                "parameterType": "query",
+                "required": true
+              }
+            }
+          }
+        },
         "resources": {
           "activities": {
             "methods": {
diff --git a/apiclient/contrib/latitude/future.json b/apiclient/contrib/latitude/future.json
index 657f6e8..3fef33a 100644
--- a/apiclient/contrib/latitude/future.json
+++ b/apiclient/contrib/latitude/future.json
@@ -3,6 +3,59 @@
     "latitude": {
       "v1": {
         "baseUrl": "https://www.googleapis.com/", 
+        "auth": {
+          "request": {
+            "url": "https://www.google.com/accounts/OAuthGetRequestToken",
+            "parameters": {
+              "xoauth_displayname": {
+                "parameterType": "query",
+                "required": False
+              },
+              "domain": {
+                "parameterType": "query",
+                "required": True
+              },
+              "scope": {
+                "parameterType": "query",
+                "required": True
+              },
+            },
+          },
+          "authorize": {
+            "url": "https://www.google.com/latitude/apps/OAuthAuthorizeToken",
+            "parameters": {
+              "oauth_token": {
+                "parameterType": "query",
+                "required": True
+              },
+              "iconUrl": {
+                "parameterType": "query",
+                "required": False
+              },
+              "domain": {
+                "parameterType": "query",
+                "required": True
+              },
+              "scope": {
+                "parameterType": "query",
+                "required": True
+              },
+            },
+          },
+          "access": {
+            "url": "https://www.google.com/accounts/OAuthGetAccessToken",
+            "parameters": {
+              "domain": {
+                "parameterType": "query",
+                "required": True
+              },
+              "scope": {
+                "parameterType": "query",
+                "required": True
+              },
+            },
+          },
+        },
         "resources": {
           "currentLocation": {
             "methods": {
@@ -23,4 +76,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/apiclient/contrib/moderator/future.json b/apiclient/contrib/moderator/future.json
index 3d46f97..7e3d978 100644
--- a/apiclient/contrib/moderator/future.json
+++ b/apiclient/contrib/moderator/future.json
@@ -3,6 +3,59 @@
     "moderator": {
       "v1": {
         "baseUrl": "https://www.googleapis.com/", 
+          "auth": {
+            "request": {
+              "url": "https://www.google.com/accounts/OAuthGetRequestToken",
+              "parameters": {
+                "xoauth_displayname": {
+                  "parameterType": "query",
+                  "required": false
+                },
+                "domain": {
+                  "parameterType": "query",
+                  "required": false
+                },
+                "scope": {
+                  "parameterType": "query",
+                  "required": true
+                }
+              }
+            },
+            "authorize": {
+              "url": "https://www.google.com/accounts/OAuthAuthorizeToken",
+              "parameters": {
+                "oauth_token": {
+                  "parameterType": "query",
+                  "required": true
+                },
+                "iconUrl": {
+                  "parameterType": "query",
+                  "required": false
+                },
+                "domain": {
+                  "parameterType": "query",
+                  "required": false
+                },
+                "scope": {
+                  "parameterType": "query",
+                  "required": true
+                }
+              }
+            },
+            "access": {
+              "url": "https://www.google.com/accounts/OAuthGetAccessToken",
+              "parameters": {
+                "domain": {
+                  "parameterType": "query",
+                  "required": false
+                },
+                "scope": {
+                  "parameterType": "query",
+                  "required": true
+                }
+              }
+            }
+          },
         "resources": {
           "profiles": {
             "methods": {
@@ -57,4 +110,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/apiclient/discovery.py b/apiclient/discovery.py
index ea76d97..5ae7f02 100644
--- a/apiclient/discovery.py
+++ b/apiclient/discovery.py
@@ -112,6 +112,7 @@
   d = simplejson.load(f)
   f.close()
   future = d['data'][serviceName][version]['resources']
+  auth_discovery = d['data'][serviceName][version]['auth']
 
   base = service['baseUrl']
   resources = service['resources']
@@ -124,6 +125,9 @@
       self._baseUrl = base
       self._model = model
 
+    def auth_discovery(self):
+      return auth_discovery
+
   def createMethod(theclass, methodName, methodDesc, futureDesc):
 
     def method(self, **kwargs):
diff --git a/apiclient/oauth.py b/apiclient/oauth.py
index 059cb5a..8b827c6 100644
--- a/apiclient/oauth.py
+++ b/apiclient/oauth.py
@@ -29,61 +29,6 @@
   raise NotImplementedError('You need to override this function')
 
 
-buzz_discovery = {
-    'request': {
-        'url': 'https://www.google.com/accounts/OAuthGetRequestToken',
-        'parameters': {
-          'xoauth_displayname': {
-           'parameterType': 'query',
-           'required': False
-          },
-          'domain': {
-           'parameterType': 'query',
-           'required': True
-          },
-          'scope': {
-           'parameterType': 'query',
-           'required': True
-          },
-        },
-      },
-    'authorize': {
-        'url': 'https://www.google.com/buzz/api/auth/OAuthAuthorizeToken',
-        'parameters': {
-          'oauth_token': {
-           'parameterType': 'query',
-           'required': True
-          },
-          'iconUrl': {
-           'parameterType': 'query',
-           'required': False
-          },
-          'domain': {
-           'parameterType': 'query',
-           'required': True
-          },
-          'scope': {
-           'parameterType': 'query',
-           'required': True
-          },
-        },
-      },
-    'access': {
-        'url': 'https://www.google.com/accounts/OAuthGetAccessToken',
-        'parameters': {
-          'domain': {
-           'parameterType': 'query',
-           'required': True
-          },
-          'scope': {
-           'parameterType': 'query',
-           'required': True
-          },
-        },
-      },
-    }
-
-
 def _oauth_uri(name, discovery, params):
   """Look up the OAuth UR from the discovery
   document and add query parameters based on