diff --git a/9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO.sha1sum b/9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO.sha1sum
deleted file mode 100644
index dfea98c..0000000
--- a/9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-c4ed4f602e5f3e14fa08f790e5efe2707da3faf5  /home/mario/.opsi-dist-cache/sereby.aio-2.0.3.1/X86/9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO
diff --git a/CLIENT_DATA/AdobeAIR.xml b/CLIENT_DATA/AdobeAIR.xml
index 4111fe6..68480cf 100644
--- a/CLIENT_DATA/AdobeAIR.xml
+++ b/CLIENT_DATA/AdobeAIR.xml
@@ -1,7 +1,7 @@
-<package id="AdobeAir" name="Adobe AIR 3.7" group="Standard Programme">
-    <check type="file" condition="<" path="%commonprogramfiles%\Adobe AIR\Versions\1.0\Adobe AIR.dll" value="3.7.0.1530"  arch="x86" />
-    <check type="file" condition="<" path="%programfiles(x86)%\Common Files\Adobe AIR\Versions\1.0\Adobe AIR.dll" value="3.7.0.1530" arch="x64" />
+<package id="AdobeAir" name="Adobe AIR 3.8" group="Standard Programme">
+    <check type="file" condition="<" path="%commonprogramfiles%\Adobe AIR\Versions\1.0\Adobe AIR.dll" value="3.8.0.370"  arch="x86" />
+    <check type="file" condition="<" path="%programfiles(x86)%\Common Files\Adobe AIR\Versions\1.0\Adobe AIR.dll" value="3.8.0.370" arch="x64" />
 	<install>
-		<cmd path="air3-7_win.exe" param="-silent -eulaAccepted" />
+		<cmd path="air3-8_win.exe" param="-silent -eulaAccepted" />
 	</install>
 </package>
\ No newline at end of file
diff --git a/air3-7_win.exe.sha1sum b/air3-7_win.exe.sha1sum
deleted file mode 100644
index b4e0e9e..0000000
--- a/air3-7_win.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-0d70cfc4d00fe3c0d117ecfd70758dea6a8c4e49  /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/air3-7_win.exe
diff --git a/air3-8_win.exe.sha1sum b/air3-8_win.exe.sha1sum
new file mode 100644
index 0000000..46a3b0c
--- /dev/null
+++ b/air3-8_win.exe.sha1sum
@@ -0,0 +1 @@
+6b84789bba106d2e120ad9a4a06b46e3e505c324  /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/air3-8_win.exe
diff --git a/builder-product.cfg b/builder-product.cfg
index a130979..22824b7 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -26,58 +26,70 @@ DL_FILE[0]="102791693_ff1cd10758.jpg"
 DL_SOURCE[0]="http://www.chip.de/ii/102791693_ff1cd10758.jpg"
 
 ## 1: 32 & 64 Bit Runtimes
-DL_FILE[1]="aio-runtimes_v${VERSION}.7z"
-DL_SOURCE[1]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/61742/?download"
-DL_ARCH[1]="X86"
-DL_EXTRACT_FORMAT[1]="7zip"
+DL_FILE[5]="aio-runtimes_v${VERSION}.7z"
+DL_SOURCE[5]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/61742/?download"
+DL_ARCH[5]="X86"
+DL_EXTRACT_FORMAT[5]="7zip"
 
-DL_FILE[7]="9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO"
-DL_SOURCE[7]="http://care.dlservice.microsoft.com/dl/download/A/5/5/A55BCF48-BF3E-4D76-AC0A-2DEC2B7F5DE1/9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO"
+DL_FILE[6]="9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO"
+DL_SOURCE[6]="http://care.dlservice.microsoft.com/dl/download/A/5/5/A55BCF48-BF3E-4D76-AC0A-2DEC2B7F5DE1/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO"
+DL_ARCH[6]="X86"
+DL_EXTRACT_FORMAT[6]="7zip"
+DL_EXTRACT_TO[6]="win8dotnet35"
+
+# DL_FILE[6]="dotNetFx3.5_8.7z"
+# DL_SOURCE[6]="file://"
+# DL_ARCH[6]="X86"
+# DL_EXTRACT_FORMAT[6]="7zip"
+# DL_EXTRACT_TO[6]="win8dotnet35"
+
+DL_FILE[7]="air3-8_win.exe"
+DL_SOURCE[7]="http://labsdownload.adobe.com/pub/labs/flashruntimes/air/air3-8_win.exe"
 DL_ARCH[7]="X86"
-DL_EXTRACT_FORMAT[7]="7zip"
-DL_EXTRACT_TO[7]="win8dotnet35"
+DL_WINST_NAME[7]=AdobeAirInstallExe
 
-DL_FILE[8]="9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO"
-DL_SOURCE[8]="http://care.dlservice.microsoft.com/dl/download/A/5/5/A55BCF48-BF3E-4D76-AC0A-2DEC2B7F5DE1/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO"
+DL_FILE[8]="jre7u21.zip"
+DL_SOURCE[8]="http://ftp.disconnected-by-peer.at/opsi/jre7u21.zip"
 DL_ARCH[8]="X86"
 DL_EXTRACT_FORMAT[8]="7zip"
-DL_EXTRACT_TO[8]="win8dotnet35"
 
-# DL_FILE[7]="dotNetFx3.5_8.7z"
-# DL_SOURCE[7]="file://"
-# DL_ARCH[7]="X86"
-# DL_EXTRACT_FORMAT[7]="7zip"
-# DL_EXTRACT_TO[7]="win8dotnet35"
+FLASHVERSION="11.7.700.169"
+
+DL_FILE[9]="install_flash_player-${FLASHVERSION}.exe"
+DL_SOURCE[9]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player.exe"
+DL_ARCH[9]="X86"
+DL_WINST_NAME[9]=InstallFlashExe
+
+DL_FILE[10]="install_flash_player_ax-${FLASHVERSION}.exe"
+DL_SOURCE[10]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player_ax.exe"
+DL_ARCH[10]="X86"
+DL_WINST_NAME[10]=InstallFlashIeExe
 
-DL_FILE[2]="air3-7_win.exe"
-DL_SOURCE[2]="http://labsdownload.adobe.com/pub/labs/flashruntimes/air/air3-7_win.exe"
-DL_ARCH[2]="X86"
-DL_WINST_NAME[2]=AdobeAirInstallExe
 
 ##################
 ### Uninstallers
 ##################
 
-DL_FILE[3]="dotnetfx_5F00_cleanup_5F00_tool.zip"
-DL_SOURCE[3]="http://blogs.msdn.com/cfs-file.ashx/__key/CommunityServer-Components-PostAttachments/00-08-90-44-93/dotnetfx_5F00_cleanup_5F00_tool.zip"
+DL_FILE[1]="dotnetfx_5F00_cleanup_5F00_tool.zip"
+DL_SOURCE[1]="http://blogs.msdn.com/cfs-file.ashx/__key/CommunityServer-Components-PostAttachments/00-08-90-44-93/dotnetfx_5F00_cleanup_5F00_tool.zip"
+DL_ARCH[1]="X86"
+DL_EXTRACT_FORMAT[1]="unzip"
+DL_EXTRACT_TO[1]="dotnet"
+
+DL_FILE[2]="JavaRa-2.1.zip"
+DL_SOURCE[2]="http://download.thewebatom.net/50f69935741f0/JavaRa-2.1.zip"
+DL_ARCH[2]="X86"
+DL_EXTRACT_FORMAT[2]="unzip"
+
+DL_FILE[3]="uninstall_flash_player.exe"
+DL_SOURCE[3]="http://download.macromedia.com/get/flashplayer/current/support/uninstall_flash_player.exe"
 DL_ARCH[3]="X86"
-DL_EXTRACT_FORMAT[3]="unzip"
-DL_EXTRACT_TO[3]="dotnet"
+DL_WINST_NAME[3]=UninstallFlashExe
 
-DL_FILE[4]="JavaRa-2.1.zip"
-DL_SOURCE[4]="http://download.thewebatom.net/50f69935741f0/JavaRa-2.1.zip"
+DL_FILE[4]="uninstall_shock_player.exe"
+DL_SOURCE[4]="http://fpdownload.macromedia.com/get/shockwave/uninstall/win/sw_uninstaller.exe"
 DL_ARCH[4]="X86"
-DL_EXTRACT_FORMAT[4]="unzip"
-
-DL_FILE[5]="uninstall_flash_player.exe"
-DL_SOURCE[5]="http://download.macromedia.com/get/flashplayer/current/support/uninstall_flash_player.exe"
-DL_ARCH[5]="X86"
-DL_WINST_NAME[5]=UninstallFlashExe
-
-DL_FILE[6]="uninstall_shock_player.exe"
-DL_SOURCE[6]="http://fpdownload.macromedia.com/get/shockwave/uninstall/win/sw_uninstaller.exe"
-DL_ARCH[6]="X86"
-DL_WINST_NAME[6]=UninstallShockExe
+DL_WINST_NAME[4]=UninstallShockExe
 
 
 ##################
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 89707ed..d5cf065 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -80,10 +80,21 @@ function create() {
     sed -e "s!-install!-force -install!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
 
     # Move Adobe Air and sereby config in place
-    mv -v $INST_DIR/CLIENT_DATA/X86/air3-7_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air
+    mv -v $INST_DIR/CLIENT_DATA/X86/air3-8_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air
     mv -v $INST_DIR/CLIENT_DATA/AdobeAIR.xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml
     sed 's/.*<\/settings>.*/\t<set component="AdobeAir" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
 
+    # Update Java 
+    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE
+    mv $INST_DIR/CLIENT_DATA/X86/JRE $INST_DIR/CLIENT_DATA/Install/Packages/
+
+    # Update Flash
+    rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Flash/*.exe
+    cp $INST_DIR/CLIENT_DATA/X86/install_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player.exe
+    cp $INST_DIR/CLIENT_DATA/X86/install_flash_player_ax-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player_ax.exe
+    sed "s!..\..\....\....!${FLASHVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
+    sed "s!.._._..._...!${FLASHVERSION//./_}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
+
     # 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
diff --git a/createjrepack.sh b/createjrepack.sh
new file mode 100644
index 0000000..f99e47e
--- /dev/null
+++ b/createjrepack.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+VERSION="7"
+UPDATE="21"
+BUILD="11"
+
+
+
+TEMPDIR=$( mktemp -d )
+
+pushd $TEMPDIR
+wget http://javadl.sun.com/webapps/download/AutoDL?BundleId=76860 -O jre-${VERSION}u${UPDATE}-windows-i586.exe
+wget http://javadl.sun.com/webapps/download/AutoDL?BundleId=76862 -O jre-${VERSION}u${UPDATE}-windows-x64.exe
+mkdir JRE
+
+WINEPREFIX=$TEMPDIR/prefix32 WINEARCH=win32 wine jre-${VERSION}u${UPDATE}-windows-i586.exe &
+while [ ! -s $TEMPDIR/prefix32/drive_c/drive_c/users/${USER}/Application\ Data/Sun/Java/jre1.7.0_21/jre1.${VERSION}.0_${UPDATE}/*.msi ]
+  do
+  printf "."
+done
+pushd JRE
+mkdir X86
+cp -v $TEMPDIR/prefix32/drive_c/users/${USER}/Application\ Data/Sun/Java/jre1.${VERSION}.0_${UPDATE}/* X86
+popd
+killall wine
+
+WINEPREFIX=$TEMPDIR/prefix64 WINEARCH=win64 wine jre-${VERSION}u${UPDATE}-windows-x64.exe &
+while [ ! -s $TEMPDIR/prefix64/drive_c/users/${USER}/Application\ Data/Sun/Java/jre1.${VERSION}.0_${UPDATE}_x64/*.msi ]
+  do
+  printf "."
+done
+pushd JRE
+mkdir X64
+cp -v $TEMPDIR/prefix64/drive_c/users/${USER}/Application\ Data/Sun/Java/jre1.${VERSION}.0_${UPDATE}_x64/* X64
+popd
+killall wine
diff --git a/install_flash_player-11.7.700.169.exe.sha1sum b/install_flash_player-11.7.700.169.exe.sha1sum
new file mode 100644
index 0000000..e7fa1d7
--- /dev/null
+++ b/install_flash_player-11.7.700.169.exe.sha1sum
@@ -0,0 +1 @@
+6f82c11e0dc67283fee46f5982cafad8eff7103a  /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/install_flash_player-11.7.700.169.exe
diff --git a/install_flash_player_ax-11.7.700.169.exe.sha1sum b/install_flash_player_ax-11.7.700.169.exe.sha1sum
new file mode 100644
index 0000000..98cbfa6
--- /dev/null
+++ b/install_flash_player_ax-11.7.700.169.exe.sha1sum
@@ -0,0 +1 @@
+91a22404552cc95ad129c1fb42adb86c046aba8f  /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/install_flash_player_ax-11.7.700.169.exe
diff --git a/jre7u21.zip.sha1sum b/jre7u21.zip.sha1sum
new file mode 100644
index 0000000..0ed940a
--- /dev/null
+++ b/jre7u21.zip.sha1sum
@@ -0,0 +1 @@
+957bfd8f086baf6aff837347b8baaaa9d243f5ce  /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/jre7u21.zip
diff --git a/uninstall_flash_player.exe.sha1sum b/uninstall_flash_player.exe.sha1sum
index 0e87c35..3fb6d43 100644
--- a/uninstall_flash_player.exe.sha1sum
+++ b/uninstall_flash_player.exe.sha1sum
@@ -1 +1 @@
-28b91734e7ab0c8fe39b53790819df96d9ba3e1f  /home/mario/.opsi-dist-cache/sereby.aio-2.0.3.1/ALL/uninstall_flash_player.exe
+1cf5f425c5b968a8f8ae3386800afee1987ea3cc  /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/uninstall_flash_player.exe