diff --git a/CLIENT_DATA/ALL/classicshell-uninstall32.exe b/CLIENT_DATA/ALL/classicshell-uninstall32.exe
new file mode 100644
index 0000000..9bc1c91
Binary files /dev/null and b/CLIENT_DATA/ALL/classicshell-uninstall32.exe differ
diff --git a/CLIENT_DATA/ALL/classicshell-uninstall64.exe b/CLIENT_DATA/ALL/classicshell-uninstall64.exe
new file mode 100644
index 0000000..38f90ba
Binary files /dev/null and b/CLIENT_DATA/ALL/classicshell-uninstall64.exe differ
diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
index c0fdcce..f57412e 100644
--- a/CLIENT_DATA/delsub3264.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -68,10 +68,12 @@ comment "Delete program shortcuts"
 LinkFolder_uninstall
 
 [Winbatch_uninstall_msi_old_32]
-msiexec /x $MsiIdOld32$ /qb! REBOOT=ReallySuppress
+"$RealUninstallProgramm32$" $MsiIdOld32$
+; msiexec /x $MsiIdOld32$ /qb! REBOOT=ReallySuppress
 
 [Winbatch_uninstall_msi_32]
-msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
+"$RealUninstallProgramm32$" $MsiId32$
+; msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
 
 [Files_uninstall_32]
 ; Example for recursively deleting the installation directory (don't forget the trailing backslash):
@@ -79,10 +81,12 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
 delete -sf "$InstallDir32$\"
 
 [Winbatch_uninstall_msi_old_64]
-msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress
+"$RealUninstallProgramm64$" $MsiIdOld64$
+; msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress
 
 [Winbatch_uninstall_msi_64]
-msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
+"$RealUninstallProgramm64$" $MsiId64$
+; msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
 
 [Files_uninstall_64]
 ; Example for recursively deleting the installation directory:
diff --git a/builder-product.cfg b/builder-product.cfg
index 7275a91..ec0b21e 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -33,3 +33,8 @@ OPSI_INI_SECTION[1]="X86_64"
 OPSI_INI_OPTION[1]="MsiId64"
 OPSI_INI_VALUE[1]="{7F34ADBE-77C0-47A0-BBC6-B3DA16CE8E68}"
 
+WINST_NAME[0]="RealUninstallProgramm32"
+WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\classicshell-uninstall32.exe"
+
+WINST_NAME[1]="RealUninstallProgramm64"
+WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[1]@\\classicshell-uninstall64.exe"
diff --git a/classicshell-uninstall.au3 b/classicshell-uninstall.au3
new file mode 100644
index 0000000..a884cc4
Binary files /dev/null and b/classicshell-uninstall.au3 differ