diff --git a/build_scripts/Ubuntu_src/BaseRetroShareDirs.tgz b/build_scripts/Ubuntu_src/BaseRetroShareDirs.tgz
index f20c9fee4..fa7409cca 100644
Binary files a/build_scripts/Ubuntu_src/BaseRetroShareDirs.tgz and b/build_scripts/Ubuntu_src/BaseRetroShareDirs.tgz differ
diff --git a/build_scripts/Ubuntu_src/make.sh b/build_scripts/Ubuntu_src/make.sh
index 69d94d21f..75992de6f 100755
--- a/build_scripts/Ubuntu_src/make.sh
+++ b/build_scripts/Ubuntu_src/make.sh
@@ -6,13 +6,22 @@ echo   - remove existing sources packages in the current directory
 echo   - build a new source package from the svn
 echo   - rebuild the source package for the karmic i386 arch.
 echo 
-echo Type ^C to abort, or \[ENTER\] to continue
-read tmp
+echo Type ^C to abort, or enter the svn version number to continue
+read svn
 
-rm -rf ./retroshare-0.5
-./clean.sh
-./makeSourcePackage.sh
+# rm -rf ./retroshare-0.5
+# ./clean.sh
+# ./makeSourcePackage.sh
 
-sudo pbuilder build *.dsc
+sudo PBUILDFOLDER=/var/cache/pbuilder pbuilder-dist karmic build *.dsc
+cp /var/cache/pbuilder/karmic_result/retroshare_0.5-1_amd64.deb ./RetroShare_0.5."$svn"_karmic_amd64.deb
+
+sudo PBUILDFOLDER=/var/cache/pbuilder pbuilder-dist karmic i386 build *.dsc
+cp /var/cache/pbuilder/karmic-i386_result/retroshare_0.5-1_i386.deb ./RetroShare_0.5."$svn"_karmic_i386.deb
+
+sudo PBUILDFOLDER=/var/cache/pbuilder pbuilder-dist jaunty build *.dsc
+cp /var/cache/pbuilder/jaunty_result/retroshare_0.5-1_amd64.deb ./RetroShare_0.5."$svn"_jaunty_amd64.deb
+
+sudo PBUILDFOLDER=/var/cache/pbuilder pbuilder-dist jaunty i386 build *.dsc
+cp /var/cache/pbuilder/jaunty-i386_result/retroshare_0.5-1_i386.deb ./RetroShare_0.5."$svn"_jaunty_i386.deb
 
-cp /var/cache/pbuilder/result/retroshare_0.5-1_i386.deb .
diff --git a/build_scripts/Ubuntu_src/makeSourcePackage.sh b/build_scripts/Ubuntu_src/makeSourcePackage.sh
index 68bb03a99..4e27e4a2f 100755
--- a/build_scripts/Ubuntu_src/makeSourcePackage.sh
+++ b/build_scripts/Ubuntu_src/makeSourcePackage.sh
@@ -5,44 +5,25 @@ if test -d "RetroShare" ;  then
 	exit
 fi
 
-
-###################### PARAMETERS ####################
-version="0.5-alpha1"
-######################################################
-
-echo attempting to get svn revision number...
-svn=`svn info | grep 'Revision:' | cut -d\  -f2`
-echo done.
-version="$version"."$svn"
-echo got version number $version. Is this correct ?
-read tmp
-
 packages="."
 
 tar zxvf $packages/BaseRetroShareDirs.tgz
 
-echo Setting up version numbers...
-cat retroshare-0.5/debian/control | sed -e s/XXXXXX/"$version"/g | sed -e s/YYYYYY/"$arch"/g | sed -e s/ZZZZZZ/"$packager"/g > retroshare-0.5/debian/control.tmp
-mv retroshare-0.5/debian/control.tmp retroshare-0.5/debian/control
-
-echo Getting svn sources
 # Ultimately, use the following, but 
 cd retroshare-0.5/src/libretroshare/
 #tar zxvf ../../../libretroshare.tgz
-svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/libretroshare/src .
+svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/branches/v0.5.0/libretroshare/src .
 cd ../../..
 #  
 cd retroshare-0.5/src/retroshare-gui/
-svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-gui/src . 
+svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/branches/v0.5.0/retroshare-gui/src . 
 #tar zxvf ../../../retroshare-gui.tgz
 cd ../../..
 
 # Various cleaning
 
-echo Cleaning...
 find retroshare-0.5 -name ".svn" -exec rm -rf {} \;		# remove all svn repositories
 
-echo Preparing package
 mv retroshare-0.5/src/retroshare-gui/RetroShare.pro retroshare-0.5/src/retroshare-gui/retroshare-gui.pro
 
 ./cleanProFile.sh retroshare-0.5/src/libretroshare/libretroshare.pro