diff --git a/admin/jbuild.sh b/admin/jbuild.sh
index 7fbc7a827..9246dce58 100644
--- a/admin/jbuild.sh
+++ b/admin/jbuild.sh
@@ -12,7 +12,7 @@ fi
 cd
 cd workspace/jailer/jailer-code/
 svn up
-sh admin/release.sh jailer_$1
+sh admin/release.sh $1
 cd
 cd tmp
 rm -r _$1
diff --git a/admin/release.sh b/admin/release.sh
index 0f86f60d0..5d3bdd3a2 100644
--- a/admin/release.sh
+++ b/admin/release.sh
@@ -1,4 +1,5 @@
-rm -rf ~/tmp/jailer
+rm -rf ~/tmp/jailer*
+rm -rf ~/tmp/dbeauty*
 rm -rf ~/tmp/$1
 rm -rf ~/tmp/$1.co
 mkdir ~/tmp/jailer
@@ -21,7 +22,9 @@ cp -r . ~/.wine/drive_c/tmp/jailer/
 rm -rf ~/.wine/drive_c/tmp/jailer/admin
 
 sed s/%VERSION%/$1/g admin/Jailer.nsi > admin/tmp.nsi
-wine ~/nsis-3.03/makensis.exe admin/tmp.nsi
+cd admin
+wine ~/nsis-3.03/makensis.exe tmp.nsi
+cd ..
 rm admin/tmp.nsi
 
 rm -rf ~/.wine/drive_c/tmp/dbeauty
@@ -29,7 +32,9 @@ cp -r . ~/.wine/drive_c/tmp/dbeauty/
 rm -rf ~/.wine/drive_c/tmp/dbeauty/admin
 
 sed s/%VERSION%/$1/g admin/dbeauty.nsi > admin/tmp.nsi
-wine ~/nsis-3.03/makensis.exe admin/tmp.nsi
+cd admin
+wine ~/nsis-3.03/makensis.exe tmp.nsi
+cd ..
 rm admin/tmp.nsi
 
 sed s/%VERSION%/$1/g admin/Jailer.nsi > admin/tmp.nsi