diff --git a/uppbox/MakeInstall4/Main.cpp b/uppbox/MakeInstall4/Main.cpp
index b3cbe27ec..2d83a3393 100644
--- a/uppbox/MakeInstall4/Main.cpp
+++ b/uppbox/MakeInstall4/Main.cpp
@@ -108,5 +108,3 @@ CONSOLE_APP_MAIN
 	SetCurrentDirectory(tmp);
 	Syx(win32 + "/umk uppbox WinInstaller2 MSC9 -ar u:/upload/upp-win32-" + Filter(version, FilterVersion) + ".exe");
 }
-
-// ~/googlecode_upload.py -s win32_daily_build -p upp-mirror upp-win32-962.exe
diff --git a/uppbox/Scripts/all b/uppbox/Scripts/all
index 8d5686b44..3ffa53494 100644
--- a/uppbox/Scripts/all
+++ b/uppbox/Scripts/all
@@ -9,4 +9,6 @@ bash ~/upp.src/uppbox/Scripts/www
 
 bash ~/upp.src/uppbox/Scripts/win
 
+rm ~/upp.tmp/*    # rm removes Win32 specific files (.dll, .exe), so we have "clean" sources now
+
 bash ~/upp.src/uppbox/Scripts/src
diff --git a/uppbox/Scripts/src b/uppbox/Scripts/src
index bde429e9c..47792418d 100644
--- a/uppbox/Scripts/src
+++ b/uppbox/Scripts/src
@@ -1 +1,3 @@
-bin/theide uppsrc ide GCC -asrxM upp.src
+rm ~/upload/* || true
+~/bin/theide upptmp ide GCC -asrxM ~/upp.tmp/u/upp.src
+tar -xvvzf ~/upload/upp-src-`svnversion ~/upp.src` ~/upp.tmp/u/
diff --git a/uppbox/Scripts/win b/uppbox/Scripts/win
index ef7c98408..a8f2186bd 100644
--- a/uppbox/Scripts/win
+++ b/uppbox/Scripts/win
@@ -1,4 +1,4 @@
 rm ~/upload/* || true
 wine "u:\Win32\theide\umk" uppbox MakeInstall4 MSC9 -ar "u:\mku.exe"
 wine "u:\mku.exe"
-upload
+~/bin/upload