diff --git a/Silverlight-5.1.20513.0.exe.sha1sum b/Silverlight-5.1.20513.0.exe.sha1sum
new file mode 100644
index 0000000..b27fd5f
--- /dev/null
+++ b/Silverlight-5.1.20513.0.exe.sha1sum
@@ -0,0 +1 @@
+9537e817a99b2a1e2522fd60dbb85a3f4c5037c8  /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/Silverlight-5.1.20513.0.exe
diff --git a/Silverlight_x64-5.1.20513.0.exe.sha1sum b/Silverlight_x64-5.1.20513.0.exe.sha1sum
new file mode 100644
index 0000000..f519ceb
--- /dev/null
+++ b/Silverlight_x64-5.1.20513.0.exe.sha1sum
@@ -0,0 +1 @@
+5791a4f1e1a399947079a2582046e6167ddb040d  /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/Silverlight_x64-5.1.20513.0.exe
diff --git a/builder-product.cfg b/builder-product.cfg
index 5add994..45a5327 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -104,6 +104,19 @@ DL_SOURCE[14]="http://fpdownload.macromedia.com/get/shockwave/default/english/wi
 DL_ARCH[14]="X86"
 DL_WINST_NAME[14]=InstallShockMsi
 
+SILVERVERSION="5.1.20513.0"
+SILVERUPDATE="1"
+
+DL_FILE[15]="Silverlight-${SILVERVERSION}.exe"
+DL_SOURCE[15]="http://download.microsoft.com/download/B/3/C/B3CF6815-40B1-4E36-8746-C4A0381AD260/20513.00/runtime/Silverlight.exe"
+DL_ARCH[15]="X86"
+DL_WINST_NAME[15]=InstallFlashExe
+
+DL_FILE[16]="Silverlight_x64-${SILVERVERSION}.exe"
+DL_SOURCE[16]="http://download.microsoft.com/download/B/3/C/B3CF6815-40B1-4E36-8746-C4A0381AD260/20513.00/runtime/Silverlight_x64.exe"
+DL_ARCH[16]="X86"
+DL_WINST_NAME[16]=InstallFlashIeExe
+
 ##################
 ### Uninstallers
 ##################
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 84f0f68..5261313 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -150,8 +150,8 @@ function create() {
 	sed "s!.._._..._...!${FLASHVERSION//./_}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
     fi
     mv -v $INST_DIR/CLIENT_DATA/AdobeFlash_mms.cfg $INST_DIR/CLIENT_DATA/Install/Packages/Flash/mms.cfg
-    sed 's/.*\t<\/install>.*/\t\t<cmd path="disable32.bat" name="Disable Flash Update Check x86" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
-    sed 's/.*\t<\/install>.*/\t\t<cmd path="disable64.bat" name="Disable Flash Update Check x64" arch="x64" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
+    sed 's/.*\t<\/install>.*/\t\t<cmd path="disable32.bat" name="Disable Flash Update Check x86" >\n<check type="file" condition="notexist" path="%Windir%\\system32\\Macromed\\Flash\\NPSWF32_%VERSION_FILE%.dll" \/>\n<\/cmd>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
+    sed 's/.*\t<\/install>.*/\t\t<cmd path="disable64.bat" name="Disable Flash Update Check x64" arch="x64" \/>\n<check type="file" condition="notexist" path="%Windir%\\SysWOW64\\Macromed\\Flash\\NPSWF32_%VERSION_FILE%.dll" arch="x64" \/>\n<\/cmd>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
     echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat
     echo "copy /y /v \"%~dp0mms.cfg\" \"%WINDIR%\system32\Macromed\Flash\mms.cfg\"" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat
     echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat
@@ -165,6 +165,15 @@ function create() {
 	sed "s!v12!v${SHOCKVERSION//r/.}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml
     fi
 
+    # Update Silverlight
+    if [ "$SILVERUPDATE" = "1" ]; then
+	rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/*.exe
+	cp $INST_DIR/CLIENT_DATA/X86/Silverlight-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight.exe
+	cp $INST_DIR/CLIENT_DATA/X86/Silverlight_x64-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight_x64.exe
+	sed "s!.\..\......\..!${SILVERVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/package.xml
+	sed "s!v5!v${SILVERVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/package.xml
+    fi
+
     # 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