diff --git a/Linux/deploy/Makefile b/Linux/deploy/Makefile.example
similarity index 91%
rename from Linux/deploy/Makefile
rename to Linux/deploy/Makefile.example
index 15affa6..1e34feb 100644
--- a/Linux/deploy/Makefile
+++ b/Linux/deploy/Makefile.example
@@ -21,7 +21,7 @@ install:
 		$(PYTHON) setup.py install --root $(DESTDIR) $(COMPILE)
 
 buildrpm:
-		$(PYTHON) setup.py bdist_rpm --post-install=rpm/postinstall --pre-uninstall=rpm/preuninstall
+		$(PYTHON) setup.py bdist_rpm
 
 builddeb:
 		# build the source package in the parent directory
diff --git a/Linux/deploy/deploy_deb.sh b/Linux/deploy/deploy.sh
similarity index 52%
rename from Linux/deploy/deploy_deb.sh
rename to Linux/deploy/deploy.sh
index f670343..06d363f 100755
--- a/Linux/deploy/deploy_deb.sh
+++ b/Linux/deploy/deploy.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
 VERSION="2.0.0"
-DEPLOYPATH="bungloo-$VERSION"
+DEPLOYPATH="bungloo-${VERSION}"
 LINUXPATH=".."
 SHAREDPATH="../.."
+DISTPATH=dist
 
 rm -rf $DEPLOYPATH
+rm -rf $DISTPATH
 
 mkdir -p $DEPLOYPATH
 mkdir -p $DEPLOYPATH/bin
@@ -14,8 +16,8 @@ touch $DEPLOYPATH/bungloo/__init__.py
 
 cp $LINUXPATH/Bungloo.py $DEPLOYPATH/bin/bungloo
 cp $LINUXPATH/Helper.py $LINUXPATH/Windows.py $DEPLOYPATH/bungloo
-cat setup.py | sed -e "s/{VERSION}/$VERSION/g" > $DEPLOYPATH/setup.py
-cat Makefile | sed -e "s/{VERSION}/$VERSION/g" > $DEPLOYPATH/Makefile
+cat setup.py.example | sed -e "s/{VERSION}/${VERSION}/g" > $DEPLOYPATH/setup.py
+cat Makefile.example | sed -e "s/{VERSION}/${VERSION}/g" > $DEPLOYPATH/Makefile
 cp -r $SHAREDPATH/WebKit $DEPLOYPATH/bungloo/
 cp -r $SHAREDPATH/images $DEPLOYPATH/bungloo/
 cp $SHAREDPATH/readme.md $DEPLOYPATH/README
@@ -25,5 +27,22 @@ cp bungloo.desktop $DEPLOYPATH/
 
 cd $DEPLOYPATH
 make builddeb
+make buildrpm
+
+echo "Cleaning up ..."
+
+mv $DISTPATH ..
+cd ..
+mv bungloo_${VERSION}_all.deb $DISTPATH
+
+rm bungloo_${VERSION}_amd64.changes
+rm bungloo_${VERSION}.diff.gz
+rm bungloo_${VERSION}.dsc
+rm bungloo_${VERSION}.orig.tar.gz
+rm -rf $DEPLOYPATH
+rm $DISTPATH/bungloo-${VERSION}-1.src.rpm
+
+echo "Done."
+
 
 # eof
diff --git a/Linux/deploy/setup.py b/Linux/deploy/setup.py.example
similarity index 100%
rename from Linux/deploy/setup.py
rename to Linux/deploy/setup.py.example