diff --git a/CLIENT_DATA/Adobe Photoshop CS2 9.0.2.msp b/CLIENT_DATA/Adobe Photoshop CS2 9.0.2.msp
deleted file mode 100644
index 5c8ed82..0000000
Binary files a/CLIENT_DATA/Adobe Photoshop CS2 9.0.2.msp and /dev/null differ
diff --git a/CLIENT_DATA/Adobe Photoshop CS2 902.mst b/CLIENT_DATA/Adobe Photoshop CS2 902.mst
new file mode 100644
index 0000000..2133a4f
Binary files /dev/null and b/CLIENT_DATA/Adobe Photoshop CS2 902.mst differ
diff --git a/CLIENT_DATA/Adobe Photoshop CS2.mst b/CLIENT_DATA/Adobe Photoshop CS2.mst
deleted file mode 100644
index 079b645..0000000
Binary files a/CLIENT_DATA/Adobe Photoshop CS2.mst and /dev/null differ
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index a178463..eee6e5c 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -82,6 +82,9 @@ else
 	ChangeDirectory "%SCRIPTPATH%"
 	Files_delete
 
+	Winbatch_prepare
+	Sub_check_exitcode
+
 	Files_copy
 	Sub_check_exitcode
 
@@ -119,11 +122,22 @@ inifile $LogDir$\$ProductId$\Abcpy.ini [OEM Install] INSTALLDIR=$InstallDir$
 [Winbatch_install]
 msiexec /i "$LogDir$\$ProductId$\commonfilesinstaller\Adobe Common File Installer.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
 msiexec /i "$LogDir$\$ProductId$\help center\Adobe Help Center 1.0.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
-msiexec /i "$LogDir$\$ProductId$\Adobe Photoshop CS2.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress TRANSFORM="$LogDir$\$ProductId$\Adobe Photoshop CS2.mst"
-msiexec /p "$LogDir$\$ProductId$\Adobe Photoshop CS2 9.0.2.msp" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
+msiexec /i "$LogDir$\$ProductId$\Adobe Photoshop CS2.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress TRANSFORM="$LogDir$\$ProductId$\Adobe Photoshop CS2 902.mst"
 msiexec /i "$LogDir$\$ProductId$\bridge\Adobe Bridge 1.0.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
 ; "$LogDir$\$ProductId$\setup.exe" /s /v /qn
 
+[Winbatch_prepare]
+msiexec /a "%ScriptPath%\X86\Core\Adobe Photoshop CS2.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! TARGETDIR="$LogDir$\$ProductId$\"
+vcopy "%ScriptPath%\X86\Updater\Core\AdobeXMP.dll" "$LogDir$\$ProductId$\program files\Adobe\Adobe Photoshop CS2\AdobeXMP.dll"
+vcopy "%ScriptPath%\X86\Updater\Core\HDRMergeAuto.8li" "$LogDir$\$ProductId$\program files\Adobe\Adobe Photoshop CS2\Zusatzmodule\Adobe Photoshop Only\Automatisieren\HDR-Mehrfachbelichtung-Aut.8li"
+vcopy "%ScriptPath%\X86\Updater\Core\MMXCore.8BX"  "$LogDir$\$ProductId$\program files\Adobe\Adobe Photoshop CS2\Zusatzmodule\Erweiterungen\MMXCore.8BX"
+vcopy "%ScriptPath%\X86\Updater\Core\MultiProcessor Support.8BX"  "$LogDir$\$ProductId$\program files\Adobe\Adobe Photoshop CS2\Zusatzmodule\Erweiterungen\Mehrprozessorunterstützung.8BX"
+vcopy "%ScriptPath%\X86\Updater\Core\Photoshop.exe" "$LogDir$\$ProductId$\program files\Adobe\Adobe Photoshop CS2\Photoshop.exe"
+msiexec /a "%ScriptPath%\X86\Core\commonfilesinstaller\Adobe Common File Installer.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! TARGETDIR="$LogDir$\$ProductId$\commonfilesinstaller"
+msiexec /a "%ScriptPath%\X86\Core\help center\Adobe Help Center 1.0.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! TARGETDIR="$LogDir$\$ProductId$\help center"
+msiexec /a "%ScriptPath%\X86\Core\bridge\Adobe Bridge 1.0.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! TARGETDIR="$LogDir$\$ProductId$\bridge"
+
+
 [Winbatch_update_bridge]
 "$UpdateBridge104Exe$"
 
@@ -131,7 +145,8 @@ msiexec /i "$LogDir$\$ProductId$\bridge\Adobe Bridge 1.0.msi" /l* "$LogDir$\$Pro
 del -sf "$LogDir$\$ProductId$\"
 
 [Files_copy]
-copy -s "%ScriptPath%\X86\Core\*.*" "$LogDir$\$ProductId$\"
+copy "%ScriptPath%\X86\Core\*.ini" "$LogDir$\$ProductId$\"
+copy "%ScriptPath%\X86\Core\*.mst" "$LogDir$\$ProductId$\"
 
 [Files_install]
 ; copy the ini file to the InstallDir
diff --git a/MultiProcessorSupport.zip.sha1sum b/MultiProcessorSupport.zip.sha1sum
new file mode 100644
index 0000000..072cb08
--- /dev/null
+++ b/MultiProcessorSupport.zip.sha1sum
@@ -0,0 +1 @@
+eb1b7e565dddb926a42c58862de6f1493c7ba879  /home/mario/.opsi-dist-cache/adobe.photoshopcs2-9.0.2/X86/MultiProcessorSupport.zip
diff --git a/OPSI/control b/OPSI/control
index 027ea5a..70b79fb 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -33,4 +33,10 @@ requiredProduct: horstmuc.inifile
 requiredStatus: installed
 requirementType: before
 
+[ProductDependency]
+action: setup
+requiredProduct: kliu.vcopy
+requiredStatus: installed
+requirementType: before
+
 
diff --git a/builder-product.cfg b/builder-product.cfg
index ad411af..b579392 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -23,18 +23,29 @@ DL_ARCH[1]="X86"
 DL_EXTRACT_FORMAT[1]="7zip"
 DL_EXTRACT_TO[1]="Temp"
 
-DL_FILE[2]="Adobe_Bridge_1.0.3.zip"
-DL_SOURCE[2]="http://download.adobe.com/pub/adobe/bridge/win/1.x/Adobe_Bridge_1.0.3.zip"
+DL_FILE[2]="ps902.exe"
+DL_SOURCE[2]="http://download.adobe.com/pub/adobe/photoshop/win/cs2/ps902.exe"
 DL_ARCH[2]="X86"
+DL_EXTRACT_TO[2]="Temp"
 DL_EXTRACT_FORMAT[2]="7zip"
-DL_EXTRACT_TO[2]="Temp/bridge"
 
-DL_FILE[3]="AdobeBridge_1.0.4_updater.exe"
-DL_SOURCE[3]="http://download.adobe.com/pub/adobe/bridge/win/1.x/AdobeBridge_1.0.4_updater.exe"
+DL_FILE[3]="Adobe_Bridge_1.0.3.zip"
+DL_SOURCE[3]="http://download.adobe.com/pub/adobe/bridge/win/1.x/Adobe_Bridge_1.0.3.zip"
 DL_ARCH[3]="X86"
-DL_EXTRACT_FORMAT[3]="cp"
-DL_EXTRACT_TO[3]="Updater"
+DL_EXTRACT_FORMAT[3]="7zip"
+DL_EXTRACT_TO[3]="Temp/bridge"
 
+DL_FILE[4]="AdobeBridge_1.0.4_updater.exe"
+DL_SOURCE[4]="http://download.adobe.com/pub/adobe/bridge/win/1.x/AdobeBridge_1.0.4_updater.exe"
+DL_ARCH[4]="X86"
+DL_EXTRACT_FORMAT[4]="cp"
+DL_EXTRACT_TO[4]="Updater"
+
+DL_FILE[5]="MultiProcessorSupport.zip"
+DL_SOURCE[5]="ftp://ftp.adobe.com/pub/adobe/photoshop/win/cs2/MultiProcessorSupport.zip"
+DL_ARCH[5]="X86"
+DL_EXTRACT_FORMAT[5]="7zip"
+DL_EXTRACT_TO[5]="Temp/MultiProcessor"
 
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 7f947d3..02fab13 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -33,8 +33,16 @@ function create() {
     rm -rf $INST_DIR/CLIENT_DATA/X86/Core/stock\ photography
     rm -rf $INST_DIR/CLIENT_DATA/X86/Core/bridge
     mv $INST_DIR/CLIENT_DATA/X86/Temp/bridge $INST_DIR/CLIENT_DATA/X86/Core/bridge
-    mv $INST_DIR/CLIENT_DATA/Adobe\ Photoshop\ CS2\ 9.0.2.msp $INST_DIR/CLIENT_DATA/X86/Core/
-    mv $INST_DIR/CLIENT_DATA/Adobe\ Photoshop\ CS2.mst $INST_DIR/CLIENT_DATA/X86/Core/
+    mv $INST_DIR/CLIENT_DATA/Adobe\ Photoshop\ CS2\ 902.mst $INST_DIR/CLIENT_DATA/X86/Core/
+    mkdir -p $INST_DIR/CLIENT_DATA/X86/Temp/Core
+    pushd $INST_DIR/CLIENT_DATA/X86/Temp/Updater
+    unshield x data1.cab
+    mv -vf App/honesty/Photoshop.exe $INST_DIR/CLIENT_DATA/X86/Updater/Core
+    mv -vf App/AdobeXMP.dll $INST_DIR/CLIENT_DATA/X86/Updater/Core
+    mv -vf Plug-ins/plug-ins/adobe_photoshop_only/automate/HDRMergeAuto.8li $INST_DIR/CLIENT_DATA/X86/Updater/Core
+    mv -vf Plug-ins/plug-ins/extensions/MMXCore.8BX $INST_DIR/CLIENT_DATA/X86/Updater/Core
+    popd
+    mv -vf $INST_DIR/CLIENT_DATA/X86/Temp/MultiProcessor/MultiProcessor\ Support.8BX $INST_DIR/CLIENT_DATA/X86/Updater/Core
     rm $INST_DIR/CLIENT_DATA/X86/Core/{*.exe,*.wri,Setup.ini}
     rm -rf $INST_DIR/CLIENT_DATA/X86/Temp
 }
diff --git a/ps902.exe.sha1sum b/ps902.exe.sha1sum
new file mode 100644
index 0000000..dccb716
--- /dev/null
+++ b/ps902.exe.sha1sum
@@ -0,0 +1 @@
+8d8d146c254e2848d4a8816c9368e2cece69e48c  /home/mario/.opsi-dist-cache/adobe.photoshopcs2-9.0.2/X86/ps902.exe