diff --git a/apiclient/discovery.py b/apiclient/discovery.py
index 408abd6..18c75ed 100644
--- a/apiclient/discovery.py
+++ b/apiclient/discovery.py
@@ -25,11 +25,20 @@
 import logging
 import os
 import re
-import simplejson
 import uritemplate
 import urllib
 import urlparse
 
+try:
+  import simplejson
+except ImportError:
+  try:
+    # Try to import from django, should work on App Engine
+    from django.utils import simplejson
+  except ImportError:
+    # Should work for Python2.6 and higher.
+    import json as simplejson
+
 
 class HttpError(Exception):
   pass
@@ -68,7 +77,7 @@
       headers['user-agent'] += ' '
     else:
       headers['user-agent'] = ''
-    headers['user-agent'] += 'google-api-client-python/1.0'
+    headers['user-agent'] += 'google-api-python-client/1.0'
     if body_value is None:
       return (headers, path_params, query, None)
     else:
diff --git a/discovery_extras.py b/discovery_extras.py
index f8c1d30..c0b84ba 100644
--- a/discovery_extras.py
+++ b/discovery_extras.py
@@ -23,9 +23,19 @@
 
 import os
 import os.path
-import simplejson
 import sys
 
+try:
+  import simplejson
+except ImportError:
+  try:
+    # Try to import from django, should work on App Engine
+    from django.utils import simplejson
+  except ImportError:
+    # Should work for Python2.6 and higher.
+    import json as simplejson
+
+
 def main():
   for filename in sys.argv[1:]:
     f = file(filename, "r")
@@ -49,4 +59,3 @@
 
 if __name__ == '__main__':
   main()
-