diff --git a/CLIENT_DATA/ALL/boottimedefrag.exe b/CLIENT_DATA/ALL/boottimedefrag.exe
new file mode 100644
index 0000000..018c9c3
Binary files /dev/null and b/CLIENT_DATA/ALL/boottimedefrag.exe differ
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 1f0c59a..f2de067 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -24,6 +24,8 @@ DefVar $INST_architecture$
 DefVar $OLD_VERSION$
 DefVar $OLD_CREATOR_TAG$
 DefVar $OLD_RELEASE$
+DefVar $RealDefraggler32Exe$
+DefVar $RealDefraggler64Exe$
 
 DefStringList $languageInfo$
 set  $languageInfo$ = getLocaleInfoMap
@@ -59,6 +61,9 @@ Set $InstallDir64$      = "%ProgramFiles64Dir%\Defraggler"
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
 
+Set $RealDefraggler32Exe$ = $InstallDir32$ + "\" + $Defraggler32Exe$
+Set $RealDefraggler64Exe$ = $InstallDir64$ + "\" + $Defraggler64Exe$
+
 if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
 	isFatalError
@@ -78,12 +83,12 @@ else
 		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
 		comment "Start setup program"
 		ChangeDirectory "%SCRIPTPATH%"
+		comment "Patch Registry"
+		Registry_install /32Bit
 		Winbatch_install_32
 		Sub_check_exitcode
 		comment "Copy files"
 		Files_install_32 /32Bit
-		comment "Patch Registry"
-		Registry_install /32Bit
 		comment "Create shortcuts"
 		LinkFolder_install
 	endif
@@ -92,12 +97,12 @@ else
 		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
 		comment "Start setup program"
 		ChangeDirectory "%SCRIPTPATH%"
+		comment "Patch Registry"
+		Registry_install /64Bit
 		Winbatch_install_64
 		Sub_check_exitcode
 		comment "Copy files"
 		Files_install_64 /64Bit
-		comment "Patch Registry"
-		Registry_install /64Bit
 		comment "Create shortcuts"
 		LinkFolder_install
 	endif
@@ -106,6 +111,7 @@ endif
 
 [Winbatch_install_32]
 "$InstallExe$" /S /D="$InstallDir32$" /L=$LanguageId$
+"%ScriptPath%\ALL\boottimedefrag.exe" "$RealDefraggler32Exe$"
 
 [Files_install_32]
 ; copy the ini file to the InstallDir
@@ -117,6 +123,7 @@ copy "$IniCfgFile$" "$InstallDir32$"
 
 [Winbatch_install_64]
 "$InstallExe$" /S /D="$InstallDir64$" /L=$LanguageId$
+"%ScriptPath%\ALL\boottimedefrag.exe" "$RealDefraggler64Exe$"
 
 [Files_install_64]
 ; copy the ini file to the InstallDir
diff --git a/boottimedefrag.au3 b/boottimedefrag.au3
new file mode 100644
index 0000000..16f2c4c
Binary files /dev/null and b/boottimedefrag.au3 differ
diff --git a/builder-product.cfg b/builder-product.cfg
index 9f1cbe9..af6edc7 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -27,6 +27,12 @@ DL_WINST_NAME[1]=InstallExe
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
 
+WINST_NAME[0]="Defraggler32Exe"
+WINST_VALUE[0]="Defraggler.exe"
+
+WINST_NAME[1]="Defraggler64Exe"
+WINST_VALUE[1]="Defraggler64.exe"
+
 OPSI_INI_SECTION[0]="X86"
 OPSI_INI_OPTION[0]="UninstallProg32"
 OPSI_INI_VALUE[0]="uninst.exe"