diff --git a/CLIENT_DATA/delsub.ins b/CLIENT_DATA/delsub3264.ins
similarity index 78%
rename from CLIENT_DATA/delsub.ins
rename to CLIENT_DATA/delsub3264.ins
index 13fc675..491c005 100644
--- a/CLIENT_DATA/delsub.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -4,19 +4,19 @@
 ; credits: http://www.opsi.org/credits/
 
 
-Set $MsiId32$ = '{E630D30A-79EE-407A-8F51-9D57D1F45230}'
+Set $UninstallProgram32$ = $InstallDir32$ + "\uninstgs.exe"
 
-Set $MsiId64$ = '{2E415339-7210-4A3B-84EA-E50FE7565F0D}'
+Set $UninstallProgram64$ = $InstallDir64$ + "\uninstgs.exe"
 
 if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
 	Message "Uninstalling " + $ProductId$ + " 32 Bit..."
 
-	if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "")
-		comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
-		Winbatch_uninstall_msi_32
+	if FileExists($UninstallProgram32$)
+		comment "Uninstall program found, starting uninstall"
+		Winbatch_uninstall_32
 		sub_check_exitcode
 	endif
-	
+
 	comment "Delete files"
 	Files_uninstall_32 /32Bit
 	comment "Cleanup registry"
@@ -26,12 +26,12 @@ endif
 if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
 	Message "Uninstalling " + $ProductId$ + " 64 Bit..."
 
-	if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "")
-		comment "MSI id " + $MsiId64$ + " found in registry, starting msiexec to uninstall"
-		Winbatch_uninstall_msi_64
+	if FileExists($UninstallProgram64$)
+		comment "Uninstall program found, starting uninstall"
+		Winbatch_uninstall_64
 		sub_check_exitcode
 	endif
-	
+
 	comment "Delete files"
 	Files_uninstall_64 /64Bit
 	comment "Cleanup registry"
@@ -41,16 +41,16 @@ endif
 comment "Delete program shortcuts"
 LinkFolder_uninstall
 
-[Winbatch_uninstall_msi_32]
-msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
+[Winbatch_uninstall_32]
+"$UninstallProgram32$" /S
 
 [Files_uninstall_32]
 ; Example for recursively deleting the installation directory (don't forget the trailing backslash):
 ;
 ; delete -sf "$InstallDir32$\"
 
-[Winbatch_uninstall_msi_64]
-msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
+[Winbatch_uninstall_64]
+"$UninstallProgram64$" /S
 
 [Files_uninstall_64]
 ; Example for recursively deleting the installation directory (don't forget the trailing backslash):
diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup3264.ins
similarity index 92%
rename from CLIENT_DATA/setup.ins
rename to CLIENT_DATA/setup3264.ins
index 0ff641e..b193adb 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -6,8 +6,8 @@
 [Actions]
 requiredWinstVersion >= "4.10.8.6"
 
-DefVar $MsiId32$
-DefVar $MsiId64$
+DefVar $UninstallProgram32$
+DefVar $UninstallProgram64$
 DefVar $LogDir$
 DefVar $ProductId$  
 DefVar $MinimumSpace$
@@ -40,10 +40,10 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; therefore please: only lower letters, no umlauts, 
 ; no white space use '-' as a seperator
 Set $ProductId$       = "ghostscript"
-Set $MinimumSpace$    = "20 MB"
+Set $MinimumSpace$    = "30 MB"
 ; the path were we find the product after the installation
-Set $InstallDir32$      = "%ProgramFiles32Dir%\gs"
-Set $InstallDir64$      = "%ProgramFiles64Dir%\gs"
+Set $InstallDir32$      = "%ProgramFiles32Dir%\gs\gs$VERSION$"
+Set $InstallDir64$      = "%ProgramFiles64Dir%\gs\gs$VERSION$"
 ; ----------------------------------------------------------------
 
 if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
@@ -54,9 +54,9 @@ else
 	comment "Show product picture"
 	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
 	
-	if FileExists("%ScriptPath%\delsub.ins")
+	if FileExists("%ScriptPath%\delsub3264.ins")
 		comment "Start uninstall sub section"
-		Sub "%ScriptPath%\delsub.ins"
+		Sub "%ScriptPath%\delsub3264.ins"
 	endif
 	
 	comment "installing"
@@ -90,7 +90,7 @@ else
 endif
 
 [Winbatch_install_32]
-msiexec /i "$Install32Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
+"$Install32Exe$" /S
 
 [Files_install_32]
 ; Example of recursively copying some files into the installation directory:
@@ -98,7 +98,7 @@ msiexec /i "$Install32Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLU
 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
 
 [Winbatch_install_64]
-msiexec /i "$Install64Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
+"$Install64Exe$" /S
 
 [Files_install_64]
 ; Example of recursively copying some files into the installation directory:
diff --git a/CLIENT_DATA/uninstall.ins b/CLIENT_DATA/uninstall3264.ins
similarity index 81%
rename from CLIENT_DATA/uninstall.ins
rename to CLIENT_DATA/uninstall3264.ins
index 78d676b..74aaa70 100644
--- a/CLIENT_DATA/uninstall.ins
+++ b/CLIENT_DATA/uninstall3264.ins
@@ -6,8 +6,8 @@
 [Actions]
 requiredWinstVersion >= "4.10.8.6"
 
-DefVar $MsiId32$
-DefVar $MsiId64$
+DefVar $UninstallProgram32$
+DefVar $UninstallProgram64$
 DefVar $LogDir$
 DefVar $ExitCode$
 DefVar $ProductId$
@@ -36,8 +36,10 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
 Set $ProductId$       = "ghostscript"
-Set $InstallDir32$      = "%ProgramFiles32Dir%\gs"
-Set $InstallDir64$      = "%ProgramFiles64Dir%\gs"
+Set $InstallDir32$    = "%ProgramFiles32Dir%\gs\gs$VERSION$"
+Set $InstallDir64$    = "%ProgramFiles64Dir%\gs\gs$VERSION$"
+Set $LicenseRequired$ = "false"
+Set $LicensePool$     = "p_" + $ProductId$
 ; ----------------------------------------------------------------
 
 
@@ -46,8 +48,7 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
 
 Message "Uninstalling " + $ProductId$ + " ..."
 
-if FileExists("%ScriptPath%\delsub.ins")
+if FileExists("%ScriptPath%\delsub3264.ins")
 	comment "Start uninstall sub section"
-	Sub "%ScriptPath%\delsub.ins"
+	Sub "%ScriptPath%\delsub3264.ins"
 endif
-
diff --git a/OPSI/control b/OPSI/control
index 53790d8..2a3e47b 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -13,8 +13,8 @@ version: VERSION
 priority: PRIORITY
 licenseRequired: False
 productClasses: 
-setupScript: setup.ins
-uninstallScript: uninstall.ins
+setupScript: setup3264.ins
+uninstallScript: uninstall3264.ins
 updateScript: 
 alwaysScript: 
 onceScript: 
diff --git a/builder-product.cfg b/builder-product.cfg
index 49e29be..e6c1ff0 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -1,9 +1,9 @@
 ############################
 # Setup product information 
 ############################
-VENDOR="pdfprinter.at"
+VENDOR="ghostscript.com"
 PN="ghostscript"
-VERSION="9.0.0"
+VERSION="9.05"
 RELEASE="1"
 PRIORITY="0"
 ADVICE=""
@@ -15,15 +15,15 @@ TYPE="public"
 DL_FILE[0]="451604026_a750b0de57.jpg"
 DL_SOURCE[0]="http://download.chip.eu/ii/451604026_a750b0de57.jpg"
 
-DL_FILE[1]="gs900x86.msi"
-DL_SOURCE[1]="ftp://download.may.co.at/Repository/msoftware/MAYComp/Current/RO/gs900x86.msi"
+DL_FILE[1]="gs905w32.exe"
+DL_SOURCE[1]="http://downloads.ghostscript.com/public/gs905w32.exe"
 DL_ARCH[1]="X86"
-DL_WINST_NAME[1]=Install32Msi
+DL_WINST_NAME[1]=Install32Exe
 
-DL_FILE[2]="gs900x64.msi"
-DL_SOURCE[2]="ftp://download.may.co.at/Repository/msoftware/MAYComp/Current/RO/gs900x64.msi"
+DL_FILE[2]="gs905w64.exe"
+DL_SOURCE[2]="http://downloads.ghostscript.com/public/gs905w64.exe"
 DL_ARCH[2]="X86_64"
-DL_WINST_NAME[2]=Install64Msi
+DL_WINST_NAME[2]=Install64Exe
 
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
diff --git a/gs900x64.msi.sha1sum b/gs900x64.msi.sha1sum
deleted file mode 100644
index 26242e3..0000000
--- a/gs900x64.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-cac3b33ce9d07bddd0471418b1d709a9e9f6dd50  /usr/portage/distfiles/gs900x64.msi
diff --git a/gs900x86.msi.sha1sum b/gs900x86.msi.sha1sum
deleted file mode 100644
index f3266fe..0000000
--- a/gs900x86.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-936145e67194b283110c702269eef1d799b31265  /usr/portage/distfiles/gs900x86.msi
diff --git a/gs905w32.exe.sha1sum b/gs905w32.exe.sha1sum
new file mode 100644
index 0000000..f42d5db
--- /dev/null
+++ b/gs905w32.exe.sha1sum
@@ -0,0 +1 @@
+8c954a652d5ad85047f7711992a2fcb400a1de80  /home/mario/.opsi-dist-cache/ghostscript-9.05/X86/gs905w32.exe
diff --git a/gs905w64.exe.sha1sum b/gs905w64.exe.sha1sum
new file mode 100644
index 0000000..e9c776a
--- /dev/null
+++ b/gs905w64.exe.sha1sum
@@ -0,0 +1 @@
+f620bb5779b150792b6c1212f21a0eb79e172b73  /home/mario/.opsi-dist-cache/ghostscript-9.05/X86_64/gs905w64.exe