diff --git a/build_scripts/Ubuntu_src/BaseRetroShareDirs.tgz b/build_scripts/Ubuntu_src/BaseRetroShareDirs.tgz
index 1b15d92ad..04c0d81e9 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/changelog b/build_scripts/Ubuntu_src/changelog
index dd0237bee..bb8c26857 100644
--- a/build_scripts/Ubuntu_src/changelog
+++ b/build_scripts/Ubuntu_src/changelog
@@ -1,4 +1,4 @@
-retroshare (0.5.1-0.XXXXXX~YYYYYY) YYYYYY; urgency=low
+retroshare (0.5.2-0.XXXXXX~YYYYYY) YYYYYY; urgency=low
 
   * Improvements
 
@@ -13,6 +13,10 @@ retroshare (0.5.1-0.XXXXXX~YYYYYY) YYYYYY; urgency=low
         * added missing Q_INIT_RESOURCE call to get the plugins icon loading correctly
  
      - GUI 
+        * Fixed an error when cancel the login password dialog at startup, the password dialog can be canceled. 
+        * Fixed layout in GeneralPage under Windows (there are three additional checkboxes).
+        * Applied patch to enable the sort of the columns star and unread in messages (from AsamK)
+        * Added missing "FORWARDED_PORT" case to natstatus
         * updated Dht and Nat Indicators to accurately reflect Network status. Roughly:
            - DHT. Off:     gray, ERROR:   red, NO RS PEERS:           yellow, GOOD: green.
            - NAT. Offline: gray, BAD NET: red, NO DHT, or FIREWALLED: yellow, GOOD: green
@@ -51,6 +55,10 @@ retroshare (0.5.1-0.XXXXXX~YYYYYY) YYYYYY; urgency=low
           based on the availability of the GPGME_EXPORT_MODE_MINIMAL option.
  
      - Connectivity
+        * Added Second Queue, to check if connections are actually valid before installing.
+        * Added Check of Time for main Core Cycle.
+        * Fixed Bug in choosing port for Proxy UDP. Chooses a Random one between 30000-50000.
+        * Added Address update from p3NetMgr => p3PeerMgr, when external address has been determined.
         * Simplification of p3ConnectMgr => p3LinkMgr, p3PeerMgr & p3NetMgr.
            - p3peermgr now uses RS_NET_MODE_XXXX instead of RS_NET_MODE_TRY_XXXX
            - p3netmgr maintains both TRY and ACTUAL mode (not visible through old interface -- TO FIX)
@@ -95,6 +103,8 @@ retroshare (0.5.1-0.XXXXXX~YYYYYY) YYYYYY; urgency=low
         * Added win32 build bat for libbitdht
  
   * Bug fixes
+     - Fixed "double-click" chat startup bug, the gpgOnly flag was incorrectly set false.
+     - Fixed the sending of outgoing messages
      - Removed popup window for file copy error, and redirected the message to std::cerr, to save users.
      - Set maximum port value to 65535 instead of old arbitrary value of 50000, and warned about 
        system-reserved ports in server settings gui enabled sorting and added dht icon for the window
@@ -134,7 +144,7 @@ retroshare (0.5.1-0.XXXXXX~YYYYYY) YYYYYY; urgency=low
          * Reduce Maximum Transmission size from 1500 -> 1000. This is the cause of Failed Connections. 
            It looks like UDP packets are being truncated from 1520 -> 1492 bytes, and this is killing the 
 
- -- Cyril Soler <csoler@users.sourceforge.net>  Sun, 31 Jul 2011 14:47:46 +0100
+ -- Cyril Soler <csoler@users.sourceforge.net>  Sat, 13 Aug 2011 20:30:00 +0100
 
 retroshare (0.5.1-0.4350~lucid) lucid; urgency=low
 
diff --git a/build_scripts/Ubuntu_src/clean.sh b/build_scripts/Ubuntu_src/clean.sh
index 21993af4c..7b23ec8dc 100755
--- a/build_scripts/Ubuntu_src/clean.sh
+++ b/build_scripts/Ubuntu_src/clean.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-rm ./retroshare_0.5.1-0.*_source.build
-rm ./retroshare_0.5.1-0.*_source.changes 
-rm ./retroshare_0.5.1-0.*.tar.gz
-rm ./retroshare_0.5.1-0.*.diff.gz
-rm ./retroshare_0.5.1-0.*.dsc 
+rm ./retroshare_0.5.2-0.*_source.build
+rm ./retroshare_0.5.2-0.*_source.changes 
+rm ./retroshare_0.5.2-0.*.tar.gz
+rm ./retroshare_0.5.2-0.*.diff.gz
+rm ./retroshare_0.5.2-0.*.dsc 
 
 rm *~
 find . -name "*~" -exec rm {} \;
diff --git a/build_scripts/Ubuntu_src/make.sh b/build_scripts/Ubuntu_src/make.sh
index ec627df26..ac14e9281 100755
--- a/build_scripts/Ubuntu_src/make.sh
+++ b/build_scripts/Ubuntu_src/make.sh
@@ -18,10 +18,10 @@ svn=4153
 rm -rf ./retroshare-0.5
 # ./makeSourcePackage.sh
 
-for dist in jaunty karmic lucid maverick natty; do
-		sudo PBUILDFOLDER=/var/cache/pbuilder pbuilder-dist "$dist" build retroshare_0.5.1-0."$svn"~"$dist".dsc
-		cp /var/cache/pbuilder/"$dist"_result/retroshare_0.5.1-0."$svn"~"$dist"_amd64.deb .
-		sudo PBUILDFOLDER=/var/cache/pbuilder pbuilder-dist "$dist" i386 build retroshare_0.5.1-0."$svn"~"$dist".dsc
-		cp /var/cache/pbuilder/"$dist"-i386_result/retroshare_0.5.1-0."$svn"~"$dist"_i386.deb .
+for dist in karmic lucid maverick natty; do
+		sudo PBUILDFOLDER=/var/cache/pbuilder pbuilder-dist "$dist" build retroshare_0.5.2-0."$svn"~"$dist".dsc
+		cp /var/cache/pbuilder/"$dist"_result/retroshare_0.5.2-0."$svn"~"$dist"_amd64.deb .
+		sudo PBUILDFOLDER=/var/cache/pbuilder pbuilder-dist "$dist" i386 build retroshare_0.5.2-0."$svn"~"$dist".dsc
+		cp /var/cache/pbuilder/"$dist"-i386_result/retroshare_0.5.2-0."$svn"~"$dist"_i386.deb .
 done
 
diff --git a/build_scripts/Ubuntu_src/makeSourcePackage.sh b/build_scripts/Ubuntu_src/makeSourcePackage.sh
index 15a036735..5c54bd24a 100755
--- a/build_scripts/Ubuntu_src/makeSourcePackage.sh
+++ b/build_scripts/Ubuntu_src/makeSourcePackage.sh
@@ -10,7 +10,7 @@ fi
 svn update
 
 ###################### PARAMETERS ####################
-version="0.5.1"
+version="0.5.2"
 ######################################################
 
 if test "$1" = "" ; then
@@ -103,7 +103,7 @@ mv -f retroshare-0.5/debian/control.tmp retroshare-0.5/debian/control
 
 cd retroshare-0.5
 
-for i in lucid karmic jaunty maverick natty; do
+for i in karmic lucid maverick natty; do
 	echo copying changelog for $i
 	cat ../changelog | sed -e s/XXXXXX/"$svn"/g | sed -e s/YYYYYY/"$i"/g > debian/changelog