diff --git a/CLIENT_DATA/X86/immunet-uninstall32.exe b/CLIENT_DATA/X86/immunet-uninstall32.exe
new file mode 100644
index 0000000..adf7caf
Binary files /dev/null and b/CLIENT_DATA/X86/immunet-uninstall32.exe differ
diff --git a/CLIENT_DATA/X86_64/immunet-uninstall64.exe b/CLIENT_DATA/X86_64/immunet-uninstall64.exe
new file mode 100644
index 0000000..a1c5047
Binary files /dev/null and b/CLIENT_DATA/X86_64/immunet-uninstall64.exe differ
diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
index c4d9123..2c41760 100644
--- a/CLIENT_DATA/delsub3264.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -24,21 +24,21 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
 		Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
 		if FileExists($UninstallProgramOld32$)
 			comment "Uninstall program found, starting uninstall"
-			Winbatch_uninstall_old_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
+			Winbatch_uninstall_old_32
 			sub_check_exitcode
 			ExitWindows /ImmediateReboot
 		endif
 		Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $OlduVersion32$ + "\uninstall.exe"
 		if FileExists($UninstallProgramOld32$)
 			comment "Uninstall program found, starting uninstall"
-			Winbatch_uninstall_old_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
+			Winbatch_uninstall_old_32
 			sub_check_exitcode
 			ExitWindows /ImmediateReboot
 		endif
         endif
 	if FileExists($UninstallProgram32$)
 		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
+		Winbatch_uninstall_32
 		sub_check_exitcode
 		ExitWindows /ImmediateReboot
 	endif
@@ -58,26 +58,26 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
 	Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..."
 
         if FileExists($IniFile64$)
-		Set $UninstallProgr64$ = GetValueFromInifile($IniFile64$,"X86_64","UninstallProg64","XXXXXXXX.exe")
+		Set $UninstallProg64$ = GetValueFromInifile($IniFile64$,"X86_64","UninstallProg64","XXXXXXXX.exe")
 		Set $OlduVersion64$ = GetValueFromInifile($IniFile64$,"COMMON","uVersion","0.0.0")
 		Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
 		if FileExists($UninstallProgramOld64$)
 			comment "Uninstall program found, starting uninstall"
-			Winbatch_uninstall_old_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
+			Winbatch_uninstall_old_64
 			sub_check_exitcode
 			ExitWindows /ImmediateReboot
 		endif
 		Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $OlduVersion64$ + "\uninstall.exe"
 		if FileExists($UninstallProgramOld64$)
 			comment "Uninstall program found, starting uninstall"
-			Winbatch_uninstall_old_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
+			Winbatch_uninstall_old_64
 			sub_check_exitcode
 			ExitWindows /ImmediateReboot
 		endif
         endif
 	if FileExists($UninstallProgram64$)
 		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
+		Winbatch_uninstall_64
 		sub_check_exitcode
 		ExitWindows /ImmediateReboot
 	endif
@@ -92,10 +92,10 @@ comment "Delete program shortcuts"
 LinkFolder_uninstall
 
 [Winbatch_uninstall_old_32]
-"$UninstallProgramOld32$" /S
+"$RealUninstallProgramm32$" "$UninstallProgramOld32$"
 
 [Winbatch_uninstall_32]
-"$UninstallProgram32$" /S
+"$RealUninstallProgramm32$" "$UninstallProgram32$"
 
 [Files_uninstall_32]
 ; Example for recursively deleting the installation directory (don't forget the trailing backslash):
@@ -103,10 +103,10 @@ LinkFolder_uninstall
 delete -sf "$InstallDir32$\"
 
 [Winbatch_uninstall_old_64]
-"$UninstallProgramOld64$" /S
+"$RealUninstallProgramm64$" "$UninstallProgramOld64$"
 
 [Winbatch_uninstall_64]
-"$UninstallProgram64$" /S
+"$RealUninstallProgramm64$" "$UninstallProgram64$"
 
 [Files_uninstall_64]
 ; Example for recursively deleting the installation directory:
diff --git a/OPSI/control b/OPSI/control
index 2c7d49a..e74253b 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -47,7 +47,7 @@ type: unicode
 name: immunet_license_required
 multivalue: False
 editable: False
-description: Activate ClamAV Devs
+description: Use License or Free Verison
 values: ["false", "true"]
 default: ["true"]
 
diff --git a/builder-product.cfg b/builder-product.cfg
index 37f0a88..ec85cf2 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -47,3 +47,9 @@ OPSI_INI_VALUE[1]="${a[0]}.${a[1]}.${a[2]}\uninstall.exe"
 OPSI_INI_SECTION[2]="X86_64"
 OPSI_INI_OPTION[2]="UninstallProg64"
 OPSI_INI_VALUE[2]="${a[0]}.${a[1]}.${a[2]}\uninstall.exe"
+
+WINST_NAME[0]="RealUninstallProgramm32"
+WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\immunet-uninstall32.exe"
+
+WINST_NAME[1]="RealUninstallProgramm64"
+WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[2]@\\immunet-uninstall64.exe"