diff --git a/MANIFEST.in b/MANIFEST.in
index fb0408bb..1d7a2f55 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,4 @@
+include buildingspy/license.txt
 recursive-include buildingspy/thirdParty *
 recursive-include buildingspy *.txt *.rst *.mo
 recursive-include doc *
diff --git a/Makefile b/Makefile
index ba949841..2be672aa 100644
--- a/Makefile
+++ b/Makefile
@@ -32,11 +32,22 @@ dist:	clean doctest unittest doc
 	cmp -s README.rst buildingspy/README.rst
 	python setup.py sdist --formats=gztar,zip
 	python setup.py bdist_egg
-	@rm -rf build
-	@rm -rf buildingspy.egg-info
+	rm -rf build
+	rm -rf buildingspy.egg-info
+	python setup.py sdist --formats=gztar,zip bdist_egg upload -r https://pypi.python.org/pypi
 	@echo "Source distribution is in directory dist"
 	@echo "To post to server, run postBuildingsPyToWeb.sh"
 
+upload:
+	@# Make sure README.rst are consistent
+	cmp -s README.rst buildingspy/README.rst
+
+
+upload-test:
+	@# Make sure README.rst are consistent
+	cmp -s README.rst buildingspy/README.rst
+	python setup.py sdist --formats=gztar,zip bdist_egg upload -r https://testpypi.python.org/pypi
+
 clean-dist:
 	rm -rf build
 	rm -rf buildingspy.egg-info
diff --git a/setup.py b/setup.py
index daa9380b..189ecee8 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ def read(fname):
     license = "3-clause BSD",
     keywords = "modelica dymola openmodelica mat",
     url = "http://simulationresearch.lbl.gov/modelica/",
-    install_requires = ["pytidylib", "gitpython"],
+# Uncommented as these don't work with pip install    install_requires = ["pytidylib", "gitpython"],
     packages = ['buildingspy',
                 'buildingspy/development', 
                 'buildingspy/examples',