diff --git a/MANIFEST.in b/MANIFEST.in
index e26d81e..1e8965e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,8 +1,5 @@
-recursive-include tests *.py *.json
-recursive-include tests/data *.json *.sh *.p12 *.pem *.jpg *.png
 recursive-include uritemplate *.py
 recursive-include apiclient *.json *.py
-include runtests.py
 include CHANGELOG
 include LICENSE
 include README
diff --git a/Makefile b/Makefile
index dd3a2dc..1e66c3a 100644
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,11 @@
 prerelease:
 	./runtests.sh python2.6
 	./runtests.sh python2.7
+	-rm -rf dist/
 	-sudo rm -rf dist/
+	-rm -rf snapshot/
 	-sudo rm -rf snapshot/
+	./tools/gae-zip-creator.sh
 	python expand-symlinks.py
 	cd snapshot; python setup.py clean
 	cd snapshot; python setup.py sdist --formats=gztar,zip
@@ -48,18 +51,18 @@
 	wget "http://support.googlecode.com/svn/trunk/scripts/googlecode_upload.py" -O googlecode_upload.py
 	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
+	python googlecode_upload.py --summary="Full Dependecies Build for Google App Engine Projects Version $(shell python setup.py --version)" --project=google-api-python-client snapshot/dist/gae/*.zip
 	python googlecode_upload.py --summary="Samples for google-api-python-client Version $(shell python setup.py --version)" --project=google-api-python-client snapshot/google-api-python-client-samples-*.tar.gz
 	python googlecode_upload.py --summary="Samples for google-api-python-client Version $(shell python setup.py --version)" --project=google-api-python-client snapshot/google-api-python-client-samples-*.zip
 
 .PHONY: oauth2_prerelease
 oauth2_prerelease:
+	-rm -rf dist/
 	-sudo rm -rf dist/
+	-rm -rf snapshot/
 	-sudo rm -rf snapshot/
 	mkdir snapshot
 	python expand-symlinks.py --source=oauth2client --dest=snapshot/oauth2client
-	python expand-symlinks.py --source=samples/dailymotion --dest=snapshot/samples/dailymotion
-	python expand-symlinks.py --source=samples/appengine --dest=snapshot/samples/appengine
-	python expand-symlinks.py --source=samples/django_sample --dest=snapshot/django_sample
 	cp setup_oauth2client.py snapshot/setup.py
 	cp MANIFEST_oauth2client.in snapshot/MANIFEST.in
 	cp README_oauth2client snapshot/README