diff --git a/CLIENT_DATA/CleanSilverlight.cmd b/CLIENT_DATA/CleanSilverlight.cmd
new file mode 100644
index 0000000..2240fe5
--- /dev/null
+++ b/CLIENT_DATA/CleanSilverlight.cmd
@@ -0,0 +1,9 @@
+reg delete HKLM\Software\Microsoft\Silverlight /f
+reg delete HKEY_CLASSES_ROOT\Installer\Products\{D7314F9862C648A4DB8BE2A5B47BE100} /f
+reg delete HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Installer\Products\{D7314F9862C648A4DB8BE2A5B47BE100} /f
+reg delete HKEY_CLASSES_ROOT\TypeLib\{283C8576-0726-4DBC-9609-3F855162009A} /f
+reg delete HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\install.exe /f
+reg delete HKEY_CLASSES_ROOT\AgControl.AgControl /f
+reg delete HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{89F4137D-6C26-4A84-BDB8-2E5A4BB71E00} /f
+rmdir /s /q "%ProgramFiles%\Microsoft Silverlight"
+rmdir /s /q "%ProgramFiles(x86)%\Microsoft Silverlight" 
\ No newline at end of file
diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins
index 4035589..f4dbafd 100644
--- a/CLIENT_DATA/cleanup3264.ins
+++ b/CLIENT_DATA/cleanup3264.ins
@@ -204,7 +204,9 @@ endif
 ]
 
 [Winbatch_silver_uninstall]
-wmic product where caption='Microsoft Silverlight' call uninstall
+; wmic product where caption='Microsoft Silverlight' call uninstall
+"%ScriptPath%\UnInstall\Package\Silverlight\CleanSilverlight.cmd"
+
 
 [opsiservicecall_silver_uninstall]
 "method": "setProductProperty"
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index cbbce0c..d175839 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -43,7 +43,7 @@ function create() {
 
     # create directories and extract the runtime packages
     mkdir -p $INST_DIR/CLIENT_DATA/{Install,Config,X86/Dimpel}
-    mkdir -p $INST_DIR/CLIENT_DATA/UnInstall/Packages/{Flash,Shockwave}
+    mkdir -p $INST_DIR/CLIENT_DATA/UnInstall/Packages/{Flash,Shockwave,Silverlight}
     7z x -o$INST_DIR/CLIENT_DATA/Install $INST_DIR/CLIENT_DATA/X86/svcpack/aio-runtimes.exe
     7z x -o$INST_DIR/CLIENT_DATA/X86/Dimpel $INST_DIR/CLIENT_DATA/X86/dimpel/svcpack/aio-runtimes.exe
 
@@ -89,6 +89,7 @@ function create() {
     # move the uninstallers in place (directory layout like the sereby package)
     mv -v $INST_DIR/CLIENT_DATA/X86/JavaRa $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE
     mv -v $INST_DIR/CLIENT_DATA/JavaUninstallScript.vbs $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE
+    mv -v $INST_DIR/CLIENT_DATA/CleanSilverlight.cmd $INST_DIR/CLIENT_DATA/UnInstall/Packages/Silverlight
     mv -v $INST_DIR/CLIENT_DATA/X86/dotnet $INST_DIR/CLIENT_DATA/UnInstall/NET
     mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_flash_player.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Flash
     mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_shock_player.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Shockwave