Index: /trunk/src/VBox/Installer/win/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 83562)
+++ /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 83563)
@@ -1168,5 +1168,6 @@
  	$(RePackScripts_0_OUTDIR)/Single-0-All.cmd \
  	$(RePackScripts_0_OUTDIR)/Single-1-Prepare.cmd \
- 	$(RePackScripts_0_OUTDIR)/Single-3-Repack.cmd
+ 	$(RePackScripts_0_OUTDIR)/Single-3-Repack.cmd \
+	Scripts/sign-attestation.sh
 endif
 RePackScripts_CLEAN = \
Index: /trunk/src/VBox/Installer/win/Scripts/Single-1-Prepare.cmd
===================================================================
--- /trunk/src/VBox/Installer/win/Scripts/Single-1-Prepare.cmd	(revision 83562)
+++ /trunk/src/VBox/Installer/win/Scripts/Single-1-Prepare.cmd	(revision 83563)
@@ -197,4 +197,8 @@
 rem
 set _MY_NEXT_SCRIPT=%_MY_OPT_OUTDIR%\Single-3-Repack.cmd
+rem If out dir is the same as repack dir this would erase original repack script
+if not exist "%_MY_NEXT_SCRIPT%" goto generate_next_script
+set _MY_NEXT_SCRIPT=%_MY_OPT_OUTDIR%\Single-3-Repack-Gen.cmd
+:generate_next_script
 echo cd /d "%cd%" > "%_MY_NEXT_SCRIPT%"
 echo call "%_MY_SCRIPT_DIR%\Single-3-Repack.cmd" --extpack "%_MY_OPT_EXTPACK%" ^