diff --git a/builder-product.cfg b/builder-product.cfg
index b1c7977..e29717b 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -10,6 +10,7 @@ RELEASE="1"
 PRIORITY="0"
 ADVICE=""
 
+
 # TYPE - defines, if the install files are public or restricteded. 
 # Valid value: restricted | public
 TYPE="public"
@@ -50,22 +51,30 @@ DL_SOURCE[7]="http://labsdownload.adobe.com/pub/labs/flashruntimes/air/air3-8_wi
 DL_ARCH[7]="X86"
 DL_WINST_NAME[7]=AdobeAirInstallExe
 
-DL_FILE[8]="jre7u21.zip"
-DL_SOURCE[8]="http://ftp.disconnected-by-peer.at/opsi/jre7u21.zip"
+JREUVERSION="21"
+JREVERSION="7.0.210.11"
+
+DL_FILE[8]="jre7u${JREUVERSION}-x86.exe"
+DL_SOURCE[8]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=76860"
 DL_ARCH[8]="X86"
-DL_EXTRACT_FORMAT[8]="7zip"
+DL_WINST_NAME[9]=InstallJre32Exe
+
+DL_FILE[9]="jre7u${JREUVERSION}-x64.exe"
+DL_SOURCE[9]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=76862"
+DL_ARCH[9]="X86"
+DL_WINST_NAME[9]=InstallJre64Exe
 
 FLASHVERSION="11.7.700.202"
 
-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_FILE[10]="install_flash_player-${FLASHVERSION}.exe"
+DL_SOURCE[10]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player.exe"
 DL_ARCH[10]="X86"
-DL_WINST_NAME[10]=InstallFlashIeExe
+DL_WINST_NAME[10]=InstallFlashExe
+
+DL_FILE[11]="install_flash_player_ax-${FLASHVERSION}.exe"
+DL_SOURCE[11]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player_ax.exe"
+DL_ARCH[11]="X86"
+DL_WINST_NAME[11]=InstallFlashIeExe
 
 
 ##################
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 3e75b00..d76a56c 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -85,17 +85,28 @@ function create() {
     sed 's/.*<\/settings>.*/\t<set component="AdobeAir" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
     sed "s!.\..\..\....!${AIRVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.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/
+    # bug in jre install path fix
     mv $INST_DIR/CLIENT_DATA/Install/Packages/JRE/_x64 $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x64
 
+    # Update Java 
+    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/*/jre.exe
+    mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x86/jre.exe
+    mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x64/jre.exe
+    sed "s!Update ..!Update ${JREUVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
+    sed "s!.\..\....\...!${JREVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
+    sed "s!/s!/s REBOOT=Suppress!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
+    echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/fixup.bat
+    echo "if exist \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/fixup.bat
+    echo "if exist \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/fixup.bat
+    # echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/fixup.bat
+    sed 's/.*\t<\/install>.*/\t\t<cmd path="fixup.bat" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
+
     # 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
+    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
diff --git a/createjrepack.sh b/createjrepack.sh
deleted file mode 100755
index 8c6c092..0000000
--- a/createjrepack.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-VERSION="7"
-UPDATE="21"
-BUILD="11"
-
-
-
-TEMPDIR=$( mktemp -d )
-USERNAME=$( whoami )
-
-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 : ; do
-    [[ -f "$TEMPDIR/prefix32/drive_c/users/${USERNAME}/Application\ Data/Sun/Java/jre1.${VERSION}.0_${UPDATE}/Data1.cab" ]] && break
-    echo "Pausing until file exists."
-    sleep 1
-done
-pushd JRE
-mkdir X86
-cp -v "$TEMPDIR/prefix32/drive_c/users/${USERNAME}/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 : ; do
-    [[ -f "$TEMPDIR/prefix64/drive_c/users/${USERNAME}/Application\ Data/Sun/Java/jre1.${VERSION}.0_${UPDATE}_x64/Data1.cab" ]] && break
-    echo "Pausing until file exists."
-    sleep 1
-done
-pushd JRE
-mkdir X64
-cp -v "$TEMPDIR/prefix64/drive_c/users/${USERNAME}/Application\ Data/Sun/Java/jre1.${VERSION}.0_${UPDATE}_x64/*" "X64"
-popd
-killall wine
diff --git a/jre7u21-x64.exe.sha1sum b/jre7u21-x64.exe.sha1sum
new file mode 100644
index 0000000..924c98c
--- /dev/null
+++ b/jre7u21-x64.exe.sha1sum
@@ -0,0 +1 @@
+9ec7523c5b8f5621ae21ab2fec12597ea029bb7f  /home/mario/.opsi-dist-cache/sereby.aio-2.0.5.1/X86/jre7u21-x64.exe
diff --git a/jre7u21-x86.exe.sha1sum b/jre7u21-x86.exe.sha1sum
new file mode 100644
index 0000000..cf1dd40
--- /dev/null
+++ b/jre7u21-x86.exe.sha1sum
@@ -0,0 +1 @@
+620472dc1e7d015ed9a7700b846565a707946fcb  /home/mario/.opsi-dist-cache/sereby.aio-2.0.5.1/X86/jre7u21-x86.exe
diff --git a/jre7u21.zip.sha1sum b/jre7u21.zip.sha1sum
deleted file mode 100644
index 0ed940a..0000000
--- a/jre7u21.zip.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-957bfd8f086baf6aff837347b8baaaa9d243f5ce  /home/mario/.opsi-dist-cache/sereby.aio-2.0.4.1/X86/jre7u21.zip