diff --git a/setup/setup.dxp b/setup/setup.dxp
index 462fbae9..4af62e4e 100644
--- a/setup/setup.dxp
+++ b/setup/setup.dxp
@@ -84,5 +84,5 @@ object CurrentProject: TCENativeProject
     'setup.d'
   )
   ConfigurationIndex = 2
-  version = '3.6.20'
+  version = '3.6.21'
 end
diff --git a/setup/setupzip-nux-noarch.sh b/setup/setupzip-nux-noarch.sh
index c69b73eb..89e6d66b 100644
--- a/setup/setupzip-nux-noarch.sh
+++ b/setup/setupzip-nux-noarch.sh
@@ -2,4 +2,5 @@ cd output
 zip -9 -j $1.zip $1
 wait
 ofile=`basename $1 .setup`
-rm -f $ofile.o
\ No newline at end of file
+rm -f $ofile.o
+rm -f $1
diff --git a/setup/version.txt b/setup/version.txt
index cedf0860..fb5a3847 100644
--- a/setup/version.txt
+++ b/setup/version.txt
@@ -1 +1 @@
-v3.6.20
+v3.6.21