diff --git a/admin/mac/build-release-osx.sh b/admin/mac/build-release-osx.sh
index 8d7973613..8ec8aaa06 100755
--- a/admin/mac/build-release-osx.sh
+++ b/admin/mac/build-release-osx.sh
@@ -4,6 +4,8 @@
 #
 ################################################################################
 
+set -e
+
 
 function header {
     echo -e "\033[0;34m==>\033[0;0;1m $1 \033[0;0m"
@@ -27,9 +29,6 @@ VERSION=$1
 
 ################################################################################
 
-    mv tomahawk.app Tomahawk.app
-    mv Tomahawk.app/Contents/MacOS/tomahawk Tomahawk.app/Contents/MacOS/Tomahawk
-
     header "Fixing and copying libraries"
     $ROOT/../admin/mac/macdeploy.py Tomahawk.app quiet
 
@@ -39,7 +38,7 @@ VERSION=$1
 
     header "Copying Sparkle framework"
     cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
-    
+
     header "Creating DMG"
     cd ..
 
@@ -48,9 +47,8 @@ VERSION=$1
 
     $ROOT/../admin/mac/create-dmg.sh Tomahawk.app
     mv Tomahawk.dmg Tomahawk-$VERSION.dmg
-    
+
     header "Creating signed Sparkle update"
     $ROOT/../admin/mac/sign_bundle.rb $VERSION ~/tomahawk_sparkle_privkey.pem
-    mv Tomahawk.app tomahawk.app
 
     header "Done!"