diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index 849e613..af69d3c 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -4,6 +4,7 @@
 ; credits: http://www.opsi.org/en/credits/
 
 
+Set $UninstallMaintenance$ = "%ProgramFiles32Dir%\Mozilla Maintenance Service\Uninstall.exe"
 Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$
 Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
 
@@ -28,6 +29,11 @@ if FileExists($UninstallProgram$)
 	Winbatch_uninstall
 	sub_check_exitcode
 endif
+if FileExists($UninstallMaintenance$)
+	comment "Uninstall Maintenance found, starting uninstall"
+	Winbatch_maintenance_uninstall
+	sub_check_exitcode
+endif
 
 comment "Delete files"
 Files_uninstall /32Bit
@@ -38,8 +44,10 @@ Registry_uninstall /32Bit
 comment "Delete program shortcuts"
 LinkFolder_uninstall
 
+[Winbatch_maintenance_uninstall]
+"$UninstallMaintenance$" /S /v"qn"
+
 [Winbatch_uninstall_old]
-"%ProgramFiles32Dir%\Mozilla Maintenance Service\Uninstall.exe” /S /v”qn”
 "$UninstallProgramOld$" -ms
 
 [Winbatch_uninstall]