diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 630a2c6..99cd7a1 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -26,6 +26,11 @@ set  $languageInfo$ = getLocaleInfoMap
 DefVar $LanguageId$
 set $LanguageId$ = getValue("default_language_id_decimal", $languageInfo$)
 
+DefStringList $ShortProgramFiles32List$
+$ShortProgramFiles32List$ = getOutStreamFromSection ('DosInAnIcon_path')
+DefVar $ShortProgramFiles32Dir$
+set $ShortProgramFiles32Dir$ = takeString (-1, $ShortProgramFiles32List$)
+
 Set $LogDir$ = "%SystemDrive%\tmp"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@@ -46,16 +51,13 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; no white space use '-' as a seperator
 Set $MinimumSpace$    = "600 MB"
 ; the path were we find the product after the installation
-Set $InstallDir$      = "%ProgramFiles32Dir%\Adobe\Acrobat 8.0"
+Set $InstallDir$      = "%ShortProgramFiles32Dir%\Adobe\Adobe Photoshop CS2"
 Set $LicenseRequired$ = "true"
 Set $LicensePool$     = "p_" + $ProductId$
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
 
-DefStringList $ShortInstallDir$
-$ShortInstallDir$ = getOutStreamFromSection ('DosInAnIcon_path')
-
 if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
 	isFatalError "No Space"
@@ -96,10 +98,10 @@ else
 endif
 
 [DosInAnIcon_path]
-"%ScriptPath%\short.bat $InstallDir$
+"%ScriptPath%\short.bat $ProgramFiles32Dir$
 
 [Winbatch_install]
-msiexec /i "$Install90Msi$"" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! EULA_ACCEPT=YES  SERIALNUMBER="$Licensekey$" USERNAME="%PCName%" COMPANYNAME="%IPName%" INSTALLDIR="$ShortInstallDir$" ALLUSERS=1 REBOOT=ReallySuppress
+msiexec /i "$Install90Msi$"" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! EULA_ACCEPT=YES  SERIALNUMBER="$Licensekey$" USERNAME="%PCName%" COMPANYNAME="%IPName%" INSTALLDIR="$InstallDir$" ALLUSERS=1 REBOOT=ReallySuppress
 ; "$Install90Msi$" /rs /sPB /l /sl "1031" /msi EULA_ACCEPT=YES  SERIALNUMBER="$Licensekey$" USERNAME="%PCName%" COMPANYNAME="%IPName%" INSTALLDIR="$InstallDir$" ALLUSERS=1
 
 [Winbatch_update]
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index 4ff244f..c20c31a 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -34,7 +34,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $InstallDir$      = "%ProgramFiles32Dir%\Adobe\Acrobat 8.0"
+Set $InstallDir$      = "%ProgramFiles32Dir%\Adobe\Adobe Photoshop CS2"
 Set $LicenseRequired$ = "true"
 Set $LicensePool$     = "p_" + $ProductId$
 ; ----------------------------------------------------------------