diff --git a/bin/build-release.sh b/bin/build-release.sh
index af55df7d8ba26855a17f0e24868f218382845f8d..836aa6d912c07d9cddb58a6154040d5a5b42eb56 100755
--- a/bin/build-release.sh
+++ b/bin/build-release.sh
@@ -56,6 +56,11 @@ if [ -f "$TARGET/composer.json" ]; then
     php "$TARGET/composer.phar" require simplesamlphp/simplesamlphp-module-saml2debug:dev-master --update-no-dev --prefer-dist -o -d "$TARGET"
 fi
 
+for MOD in InfoCard aggregator aggregator2 autotest consentSimpleAdmin logpeek metaedit modinfo openid openidProvider papi saml2debug
+do
+    mv "$TARGET/modules/$MOD/default-enable" "$TARGET/modules/$MOD/default-disable"
+done
+
 mkdir -p "$TARGET/config" "$TARGET/metadata" "$TARGET/cert" "$TARGET/log"
 cp -rv "$TARGET/config-templates/"* "$TARGET/config/"
 cp -rv "$TARGET/metadata-templates/"* "$TARGET/metadata/"