diff --git a/CLIENT_DATA/mms.cfg b/CLIENT_DATA/mms.cfg
new file mode 100644
index 0000000..119f1e8
--- /dev/null
+++ b/CLIENT_DATA/mms.cfg
@@ -0,0 +1 @@
+AutoUpdateDisable=1
diff --git a/aio-runtimes_v2.0.6.1.7z.sha1sum b/aio-runtimes_v2.0.6.1.7z.sha1sum
deleted file mode 100644
index f146b5e..0000000
--- a/aio-runtimes_v2.0.6.1.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-f836e0ea28053285173770218d94990dd7dd0c7b  /home/mario/.opsi-dist-cache/sereby.aio-2.0.6.1/X86/aio-runtimes_v2.0.6.1.7z
diff --git a/aio-runtimes_v2.0.7.1.7z.sha1sum b/aio-runtimes_v2.0.7.1.7z.sha1sum
new file mode 100644
index 0000000..e505b46
--- /dev/null
+++ b/aio-runtimes_v2.0.7.1.7z.sha1sum
@@ -0,0 +1 @@
+d7280a90f0e2d174f64222fc8841ce4de78c5704  /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/aio-runtimes_v2.0.7.1.7z
diff --git a/builder-product.cfg b/builder-product.cfg
index 9fe1607..026a2ee 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -5,7 +5,7 @@ VENDOR="sereby.org"
 PN="sereby.aio"
 NAME="All in One Runtimes "
 DESCRIPTION="Das All in One Runtimes Paket buendelt alle wichtigen Runtime Pakete die benoetigt werden um sicherzustellen, dass alle Programme auch reibungslos funktionieren."
-VERSION="2.0.6.1"
+VERSION="2.0.7.1"
 RELEASE="1"
 PRIORITY="0"
 ADVICE=""
@@ -28,7 +28,7 @@ DL_SOURCE[0]="http://www.chip.de/ii/102791693_ff1cd10758.jpg"
 
 ## 1: 32 & 64 Bit Runtimes
 DL_FILE[5]="aio-runtimes_v${VERSION}.7z"
-DL_SOURCE[5]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/63888/?download"
+DL_SOURCE[5]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/64076/?download"
 DL_ARCH[5]="X86"
 DL_EXTRACT_FORMAT[5]="7zip"
 
@@ -53,7 +53,7 @@ DL_WINST_NAME[7]=AdobeAirInstallExe
 
 JREUVERSION="25"
 JREVERSION="7.0.250.17"
-JREUPDATE="1"
+JREUPDATE="0"
 
 DL_FILE[8]="jre7u${JREUVERSION}-x86.exe"
 DL_SOURCE[8]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=79063"
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index b1df226..739d4be 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -98,11 +98,11 @@ function create() {
     fi
 
     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
+    echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
+    echo "if exist \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.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/disable.bat
+    # echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
+    sed 's/.*\t<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
 
     # Update Flash
     if [ "$FLASHUPDATE" = "1" ]; then
@@ -112,6 +112,13 @@ function create() {
 	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
     fi
+    mv -v $INST_DIR/CLIENT_DATA/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
+    echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat
+    echo "copy /y /v mms.cfg %WINDIR%\system32\Macromed\Flash\ " >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat
+    echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat
+    echo "copy /y /v mms.cfg %WINDIR%\SysWOW64\Macromed\Flash\ " >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat
 
     # 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