diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index f8f1e73..1184960 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -1,13 +1,28 @@
 ; Copyright (c) uib gmbh (www.uib.de)
 ; This sourcecode is owned by uib gmbh
 ; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/credits/
+; credits: http://www.opsi.org/en/credits/
 
 
-Set $UninstallProgram$ = $InstallDir$ + "\unistall.exe"
+Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
+Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
+Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
 
-Message "Uninstalling " + $ProductId$ + " ..."
+if FileExists($IniFile$)
+	Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","")
+	Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","")
+	Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","")
+endif
+Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..."
 
+if FileExists($IniFile$)
+        Set $UninstallProgramOld$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe")
+	if FileExists($UninstallProgramOld$)
+		comment "Uninstall program found, starting uninstall"
+		Winbatch_uninstall_old
+		sub_check_exitcode
+	endif
+endif
 if FileExists($UninstallProgram$)
 	comment "Uninstall program found, starting uninstall"
 	Winbatch_uninstall
@@ -23,12 +38,16 @@ Registry_uninstall /32Bit
 comment "Delete program shortcuts"
 LinkFolder_uninstall
 
+[Winbatch_uninstall_old]
+"$UninstallProgramOld$" /S
+
 [Winbatch_uninstall]
 "$UninstallProgram$" /S
 
 [Files_uninstall]
-; Example for recursively deleting the installation directory (don't forget the trailing backslash):
+; Example for recursively deleting the installation directory:
 ;
+del -sf "$InstallDir$\"
 
 [Registry_uninstall]
 ; Example of deleting a registry key:
diff --git a/CLIENT_DATA/login.ins b/CLIENT_DATA/login.ins
new file mode 100644
index 0000000..7b85744
--- /dev/null
+++ b/CLIENT_DATA/login.ins
@@ -0,0 +1,24 @@
+; Copyright (c) uib gmbh (www.uib.de)
+; This sourcecode is owned by uib gmbh
+; and published under the Terms of the General Public License.
+; credits: http://www.opsi.org/en/credits/
+
+[Actions]
+Message "Profile Patch for VLC ...."
+
+comment "Did we run this script before ? - and set version stamp in profile"
+if getValue("installationstate", getProductMap) = "installed"
+	comment "Product is installed"
+	if not (scriptWasExecutedBefore)
+		comment "loginscript was not run yet "
+		Files_profile_copy
+		Registry_currentuser_set
+	endif
+endif
+
+[Files_profile_copy]
+copy "%Scriptpath%\profiles\*.*" "%CurrentAppdataDir%\ACME"
+
+[Registry_currentuser_set]
+openkey [HKCU\Software\ACME]
+set "show_greeting_window" = "no"
diff --git a/CLIENT_DATA/opsi-filezilla.server.ini b/CLIENT_DATA/opsi-filezilla.server.ini
new file mode 100644
index 0000000..41585d5
--- /dev/null
+++ b/CLIENT_DATA/opsi-filezilla.server.ini
@@ -0,0 +1,5 @@
+[X86]
+
+[COMMON]
+PN=name
+VERSION=version
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 9032e62..9a1b814 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -1,17 +1,23 @@
 ; Copyright (c) uib gmbh (www.uib.de)
 ; This sourcecode is owned by uib
 ; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/credits/
+; credits: http://www.opsi.org/en/credits/
 
 [Actions]
-requiredWinstVersion >= "4.10.8.6"
+requiredWinstVersion >= "4.11.2.6"
 
 DefVar $UninstallProgram$
+DefVar $UninstallProgramOld$
+DefVar $IniFile$
+DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ProductId$  
 DefVar $MinimumSpace$
 DefVar $InstallDir$
 DefVar $ExitCode$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
@@ -31,28 +37,30 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ;$ProductId$ should be the name of the product in opsi
 ; therefore please: only lower letters, no umlauts, 
 ; no white space use '-' as a seperator
-Set $ProductId$       = "filezilla.server"
 Set $MinimumSpace$    = "20 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\FileZilla FTP Server"
 ; ----------------------------------------------------------------
 
+Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
+
 if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
-	isFatalError
+	isFatalError "No Space"
 	; Stop process and set installation status to failed
 else
 	comment "Show product picture"
-	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 	
 	if FileExists("%ScriptPath%\delsub32.ins")
 		comment "Start uninstall sub section"
 		Sub "%ScriptPath%\delsub32.ins"
 	endif
 	
-	Message "Installing " + $ProductId$ + " ..."
+	Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..."
 	
 	comment "Start setup program"
+	ChangeDirectory "%SCRIPTPATH%"
 	Winbatch_install
 	Sub_check_exitcode
 	
@@ -65,24 +73,15 @@ else
 	comment "Create shortcuts"
 	LinkFolder_install
 	
-	comment "Test for installation success"
-	; Test if software marked as installed in registry
-	; if (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] DisplayName") = "")
-	; 	logError "Fatal: After Installation 32 bit [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] not found"
-	; 	isFatalError
-	; else
-	; 	comment "Successful Installation"
-	; endif
-
 endif
 
 [Winbatch_install]
-; Choose one of the following examples as basis for your installation
-; You can use $LicenseKey$ var to pass a license key to the installer
-;
 "$InstallExe$" /S
 
 [Files_install]
+; copy the ini file to the InstallDir
+copy "$IniCfgFile$" "$InstallDir$"
+
 ; Example of recursively copying some files into the installation directory:
 ;
 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index 47291fd..973de90 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -1,16 +1,22 @@
 ; Copyright (c) uib gmbh (www.uib.de)
 ; This sourcecode is owned by uib gmbh
 ; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/credits/
+; credits: http://www.opsi.org/en/credits/
 
 [Actions]
-requiredWinstVersion >= "4.10.8.6"
+requiredWinstVersion >= "4.11.2.6"
 
 DefVar $UninstallProgram$
+DefVar $UninstallProgramOld$
+DefVar $IniFile$
+DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ExitCode$
 DefVar $ProductId$
 DefVar $InstallDir$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
@@ -27,13 +33,13 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "filezilla.server"
 Set $InstallDir$      = "%ProgramFiles32Dir%\FileZilla FTP Server"
 ; ----------------------------------------------------------------
 
+Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
 
 comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 
 Message "Uninstalling " + $ProductId$ + " ..."
 
diff --git a/FileZilla_0.9.41_win32-setup.exe.sha1sum b/FileZilla_0.9.41_win32-setup.exe.sha1sum
deleted file mode 100644
index 5a45083..0000000
--- a/FileZilla_0.9.41_win32-setup.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-77d26fb1feaae5731b46adcec5683b8e26031de0  /home/mario/.opsi-dist-cache/filezilla.server-0.9.41/X86/FileZilla_0.9.41_win32-setup.exe
diff --git a/FileZilla_Server-0.9.41.exe.sha1sum b/FileZilla_Server-0.9.41.exe.sha1sum
new file mode 100644
index 0000000..2ca8353
--- /dev/null
+++ b/FileZilla_Server-0.9.41.exe.sha1sum
@@ -0,0 +1 @@
+77d26fb1feaae5731b46adcec5683b8e26031de0  /home/mario/.opsi-dist-cache/filezilla.server-0.9.41/X86/FileZilla_Server-0.9.41.exe
diff --git a/OPSI/control b/OPSI/control
index 30507bf..9fc4bd0 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -21,15 +21,6 @@ onceScript:
 customScript: 
 userLoginScript: 
 
-[ProductProperty]
-type: unicode
-name: install_architecture
-multivalue: False
-editable: False
-description: which architecture (32/64 bit) has to be installed
-values: ["32 only", "64 only", "both", "system specific"]
-default: ["system specific"]
-
 [ProductDependency]
 action: setup
 requiredProduct: sereby.aio
diff --git a/builder-product.cfg b/builder-product.cfg
index 82731bd..ab8c102 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -3,6 +3,8 @@
 ############################
 VENDOR="filezilla.de"
 PN="filezilla.server"
+NAME="FileZilla Server"
+DESCRIPTION="FileZilla Server ist ein modernes und leistungsstarkes FTP-Dienst fuer Windows."
 VERSION="0.9.41"
 RELEASE="3"
 PRIORITY="0"
@@ -12,12 +14,10 @@ ADVICE=""
 # Valid value: restricted | public
 TYPE="public"
 
-
-  
 DL_FILE[0]="FileZilla-Server-icon.png"
 DL_SOURCE[0]="http://icons.iconarchive.com/icons/ncrow/mega-pack-1/256/FileZilla-Server-icon.png"
 
-DL_FILE[1]="FileZilla_${VERSION}_win32-setup.exe"
+DL_FILE[1]="FileZilla_Server-${VERSION}.exe"
 DL_SOURCE[1]="http://sourceforge.net/projects/filezilla/files/FileZilla%20Server/${VERSION}/FileZilla_Server-0_9_41.exe"
 DL_ARCH[1]="X86"
 DL_WINST_NAME[1]=InstallExe
@@ -25,3 +25,6 @@ DL_WINST_NAME[1]=InstallExe
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
 
+OPSI_INI_SECTION[0]="X86"
+OPSI_INI_OPTION[0]="UninstallProg"
+OPSI_INI_VALUE[0]="uninstall.exe"