diff --git a/scripts/generate-dmg.sh b/scripts/generate-dmg.sh
index 8c95866d..06c11cf0 100755
--- a/scripts/generate-dmg.sh
+++ b/scripts/generate-dmg.sh
@@ -11,6 +11,8 @@ if [ "$BUILD_CONFIG" != "Debug" ] && [ "$BUILD_CONFIG" != "Release" ]; then
   fail "Invalid build configuration"
 fi
 
+[ "$SIGNING_KEY" == "" ] || git diff-index --quiet HEAD -- || fail "Signed release builds must not have unstaged changes!"
+
 BUILD_ROOT=$PWD/build
 SOURCE_ROOT=$PWD
 BUILD_FOLDER=$BUILD_ROOT/build-$BUILD_CONFIG
diff --git a/scripts/generate-installers.bat b/scripts/generate-installers.bat
index 4df11c2c..7a2ad7fe 100644
--- a/scripts/generate-installers.bat
+++ b/scripts/generate-installers.bat
@@ -17,6 +17,13 @@ if /I "%BUILD_CONFIG%"=="debug" (
             set BUILD_CONFIG=release
             set SIGN=1
             set MUST_DEPLOY_SYMBOLS=1
+
+            rem Fail if there are unstaged changes
+            git diff-index --quiet HEAD --
+            if !ERRORLEVEL! NEQ 0 (
+                echo Signed release builds must not have unstaged changes!
+                exit /b 1
+            )
         ) else (
             echo Invalid build configuration
             exit /b 1