diff --git a/MANIFEST.in b/MANIFEST.in
index 6ccb0b2..e44052a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,13 +2,13 @@
 recursive-include tests/data *.json *.sh *.p12 *.pem *.jpg *.png
 recursive-include uritemplate *.py
 recursive-include apiclient *.json *.py
-recursive-include docs *.html
 recursive-include samples *.py *.png *.html *.yaml *.json
 include samples/gtaskqueue_sample/gtaskqueue/gen_appengine_access_token
 include samples/gtaskqueue_sample/gtaskqueue/gtaskqueue
 include samples/gtaskqueue_sample/gtaskqueue/gtaskqueue_puller
 include runtests.py
 include CHANGELOG
+include LICENSE
 include README
 include FAQ
 include runsamples.py
diff --git a/Makefile b/Makefile
index 2bdfc3c..f488113 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,6 @@
 	python googlecode_upload.py --summary="google-api-python-client Version $(shell python setup.py --version)" --project=google-api-python-client snapshot/dist/*.tar.gz
 	python googlecode_upload.py --summary="google-api-python-client Version $(shell python setup.py --version)" --project=google-api-python-client snapshot/dist/*.zip
 
-
 .PHONY: oauth2_prerelease
 oauth2_prerelease:
 	-sudo rm -rf dist/
diff --git a/setup.py b/setup.py
index 9151059..67b9d2a 100644
--- a/setup.py
+++ b/setup.py
@@ -22,10 +22,6 @@
 packages = [
   'apiclient',
   'oauth2client',
-  'apiclient.ext',
-  'apiclient.contrib',
-  'apiclient.contrib.latitude',
-  'apiclient.contrib.moderator',
   'uritemplate',
   ]
 
@@ -34,11 +30,16 @@
     'python-gflags',
     ]
 
+needs_json = True
 try:
   import json
   needs_json = False
 except ImportError:
-  needs_json = True
+  try:
+    import simplejson
+    needs_json = False
+  except ImportError:
+    needs_json = True
 
 if needs_json:
   install_requires.append('simplejson')
@@ -59,7 +60,6 @@
       install_requires=install_requires,
       packages=packages,
       package_data={
-        'apiclient': ['contrib/*/*.json']
         },
       scripts=['bin/enable-app-engine-project'],
       license="Apache 2.0",
diff --git a/setup_oauth2client.py b/setup_oauth2client.py
index 579fe5f..fd2b67d 100644
--- a/setup_oauth2client.py
+++ b/setup_oauth2client.py
@@ -28,11 +28,16 @@
     'python-gflags',
     ]
 
+needs_json = True
 try:
   import json
   needs_json = False
 except ImportError:
-  needs_json = True
+  try:
+    import simplejson
+    needs_json = False
+  except ImportError:
+    needs_json = True
 
 if needs_json:
   install_requires.append('simplejson')