diff --git a/7zsd_extra_150_2712.7z.sha1sum b/7zsd_extra_150_2712.7z.sha1sum
new file mode 100644
index 0000000..eade01a
--- /dev/null
+++ b/7zsd_extra_150_2712.7z.sha1sum
@@ -0,0 +1 @@
+d358f546b804f5a8259fba93462fbfa91264f461  /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/7zsd_extra_150_2712.7z
diff --git a/CLIENT_DATA/AdobeAIR.xml b/CLIENT_DATA/AdobeAIR.xml
index 68480cf..4a2271c 100644
--- a/CLIENT_DATA/AdobeAIR.xml
+++ b/CLIENT_DATA/AdobeAIR.xml
@@ -1,7 +1,7 @@
-<package id="AdobeAir" name="Adobe AIR 3.8" group="Standard Programme">
+<package id="AdobeAir" name="Adobe AIR 3.8.0.370" 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-8_win.exe" param="-silent -eulaAccepted" />
+		<cmd path="AdobeAIR.exe" />
 	</install>
 </package>
\ No newline at end of file
diff --git a/CLIENT_DATA/AdobeAIR_7zip_config.txt b/CLIENT_DATA/AdobeAIR_7zip_config.txt
new file mode 100644
index 0000000..5aa554b
--- /dev/null
+++ b/CLIENT_DATA/AdobeAIR_7zip_config.txt
@@ -0,0 +1,6 @@
+;!@Install@!UTF-8!
+RunProgram="air3-8_win.exe -silent -eulaAccepted"
+ExtractTitle="Geos One Adobe Air 3.8 Installer"
+ExtractDialogText="Extracting Adobe AIR 3.8"
+GUIMode="1"
+;!@InstallEnd@!
diff --git a/builder-product.cfg b/builder-product.cfg
index 35cd6d9..cb3dff4 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -51,32 +51,38 @@ 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]="7zsd_extra_150_2712.7z"
+DL_SOURCE[8]="http://www.7zsfx.info/files/7zsd_extra_150_2712.7z"
+DL_ARCH[8]="X86"
+DL_EXTRACT_FORMAT[8]="7zip"
+DL_EXTRACT_TO[8]="7ZipSFX"
+
 JREUVERSION="25"
 JREVERSION="7.0.250.17"
 JREUPDATE="0"
 
-DL_FILE[8]="jre7u${JREUVERSION}-x86.exe"
-DL_SOURCE[8]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=79063"
-DL_ARCH[8]="X86"
+DL_FILE[9]="jre7u${JREUVERSION}-x86.exe"
+DL_SOURCE[9]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=79063"
+DL_ARCH[9]="X86"
 DL_WINST_NAME[9]=InstallJre32Exe
 
-DL_FILE[9]="jre7u${JREUVERSION}-x64.exe"
-DL_SOURCE[9]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=79065"
-DL_ARCH[9]="X86"
-DL_WINST_NAME[9]=InstallJre64Exe
+DL_FILE[10]="jre7u${JREUVERSION}-x64.exe"
+DL_SOURCE[10]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=79065"
+DL_ARCH[10]="X86"
+DL_WINST_NAME[10]=InstallJre64Exe
 
 FLASHVERSION="11.7.700.224"
 FLASHUPDATE="0"
 
-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]=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_FILE[11]="install_flash_player-${FLASHVERSION}.exe"
+DL_SOURCE[11]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player.exe"
 DL_ARCH[11]="X86"
-DL_WINST_NAME[11]=InstallFlashIeExe
+DL_WINST_NAME[11]=InstallFlashExe
+
+DL_FILE[12]="install_flash_player_ax-${FLASHVERSION}.exe"
+DL_SOURCE[12]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player_ax.exe"
+DL_ARCH[12]="X86"
+DL_WINST_NAME[12]=InstallFlashIeExe
 
 
 ##################
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index b4c669b..6b67c71 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -82,8 +82,12 @@ function create() {
     # Move Adobe Air and sereby config in place
     mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-8_win.exe
     mv -v $INST_DIR/CLIENT_DATA/AdobeAIR.xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml
+    mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt
     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
+    7z a $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-8_win.exe
+    cat $INST_DIR/CLIENT_DATA/X86/7ZipSFX/7zsd_All.sfx $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z > $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.exe
+    rm $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-8_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z
 
     # bug in jre install path fix
     mv $INST_DIR/CLIENT_DATA/Install/Packages/JRE/_x64 $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x64