diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
deleted file mode 100644
index 94819be..0000000
--- a/CLIENT_DATA/delsub32.ins
+++ /dev/null
@@ -1,97 +0,0 @@
-; 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/
-
-
-Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$
-Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
-
-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 $UninstallProg$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe")
-	Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
-	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
-	sub_check_exitcode
-endif
-
-comment "Delete files"
-Files_uninstall /32Bit
-
-comment "Cleanup registry"
-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:
-;
-del -sf "$InstallDir$\"
-
-[Registry_uninstall]
-; Example of deleting a registry key:
-;
-; deletekey [HKEY_LOCAL_MACHINE\Software\$ProductId$]
-
-[LinkFolder_uninstall]
-; Example of deleting a folder from AllUsers startmenu:
-;
-; set_basefolder common_programs
-; delete_subfolder $ProductId$
-;
-; Example of deleting a shortcut from AllUsers desktop:
-;
-; set_basefolder common_desktopdirectory
-; set_subfolder ""
-; delete_element $ProductId$
-
-[Sub_check_exitcode]
-comment "Test for installation success via exit code"
-set $ExitCode$ = getLastExitCode
-; informations to exit codes see
-; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx
-; http://msdn.microsoft.com/en-us/library/aa368542.aspx
-if ($ExitCode$ = "0")
-	comment "Looks good: setup program gives exitcode zero"
-else
-	comment "Setup program gives a exitcode unequal zero: " + $ExitCode$
-	if ($ExitCode$ = "1605")
-		comment "ERROR_UNKNOWN_PRODUCT	1605	This action is only valid for products that are currently installed."
-		comment "Uninstall of a not installed product failed - no problem"
-	else
-		if ($ExitCode$ = "1641")
-			comment "looks good: setup program gives exitcode 1641"
-			comment "ERROR_SUCCESS_REBOOT_INITIATED	1641	The installer has initiated a restart. This message is indicative of a success."
-		else
-			if ($ExitCode$ = "3010")
-				comment "looks good: setup program gives exitcode 3010"
-				comment "ERROR_SUCCESS_REBOOT_REQUIRED	3010	A restart is required to complete the install. This message is indicative of a success."
-			else
-				logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$
-				isFatalError
-			endif
-		endif
-	endif
-endif
-
diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
new file mode 100644
index 0000000..dc2993c
--- /dev/null
+++ b/CLIENT_DATA/delsub3264.ins
@@ -0,0 +1,141 @@
+; 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/
+
+
+Set $UninstallProgram32$ = $InstallDir32$ + "\" + $UninstallProg32$
+Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
+
+Set $UninstallProgram64$ = $InstallDir64$ + "\" + $UninstallProg64$
+Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini"
+
+if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
+	if FileExists($IniFile32$)
+    		Set $OLD_VERSION$ = GetValueFromInifile($IniFile32$,"COMMON","VERSION","")
+	        Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile32$,"COMMON","CREATOR_TAG","")
+	        Set $OLD_RELEASE$ = GetValueFromInifile($IniFile32$,"COMMON","RELEASE","")
+	endif
+	Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 32 Bit..."
+
+        if FileExists($IniFile32$)
+		Set $UninstallProg32$ = GetValueFromInifile($IniFile32$,"X86","UninstallProg32","XXXXXXXX.exe")
+		Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
+		if FileExists($UninstallProgramOld32$)
+			comment "Uninstall program found, starting uninstall"
+			Winbatch_uninstall_old_32
+			sub_check_exitcode
+		endif
+        endif
+	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"
+	Registry_uninstall /32Bit
+endif
+
+if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
+	if FileExists($IniFile64$)
+    		Set $OLD_VERSION$ = GetValueFromInifile($IniFile64$,"COMMON","VERSION","")
+	        Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile64$,"COMMON","CREATOR_TAG","")
+	        Set $OLD_RELEASE$ = GetValueFromInifile($IniFile64$,"COMMON","RELEASE","")
+	endif
+	Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..."
+
+        if FileExists($IniFile64$)
+		Set $UninstallProg64$ = GetValueFromInifile($IniFile64$,"X86_64","UninstallProg64","XXXXXXXX.exe")
+		Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
+		if FileExists($UninstallProgramOld64$)
+			comment "Uninstall program found, starting uninstall"
+			Winbatch_uninstall_old_64
+			sub_check_exitcode
+		endif
+        endif
+	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"
+	Registry_uninstall /64Bit
+endif
+
+comment "Delete program shortcuts"
+LinkFolder_uninstall
+
+[Winbatch_uninstall_old_32]
+"$UninstallProgramOld32$" /S
+
+[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_old_64]
+"$UninstallProgramOld64$" /S
+
+[Winbatch_uninstall_64]
+"$UninstallProgram64$" /S
+
+[Files_uninstall_64]
+; Example for recursively deleting the installation directory:
+;
+del -sf "$InstallDir64$\"
+
+[Registry_uninstall]
+; Example of deleting a registry key:
+;
+; deletekey [HKEY_LOCAL_MACHINE\Software\$ProductId$]
+
+[LinkFolder_uninstall]
+; Example of deleting a folder from AllUsers startmenu:
+;
+; set_basefolder common_programs
+; delete_subfolder $ProductId$
+;
+; Example of deleting a shortcut from AllUsers desktop:
+;
+; set_basefolder common_desktopdirectory
+; set_subfolder ""
+; delete_element $ProductId$
+
+[Sub_check_exitcode]
+comment "Test for installation success via exit code"
+set $ExitCode$ = getLastExitCode
+; informations to exit codes see
+; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx
+; http://msdn.microsoft.com/en-us/library/aa368542.aspx
+if ($ExitCode$ = "0")
+	comment "Looks good: setup program gives exitcode zero"
+else
+	comment "Setup program gives a exitcode unequal zero: " + $ExitCode$
+	if ($ExitCode$ = "1605")
+		comment "ERROR_UNKNOWN_PRODUCT	1605	This action is only valid for products that are currently installed."
+		comment "Uninstall of a not installed product failed - no problem"
+	else
+		if ($ExitCode$ = "1641")
+			comment "looks good: setup program gives exitcode 1641"
+			comment "ERROR_SUCCESS_REBOOT_INITIATED	1641	The installer has initiated a restart. This message is indicative of a success."
+		else
+			if ($ExitCode$ = "3010")
+				comment "looks good: setup program gives exitcode 3010"
+				comment "ERROR_SUCCESS_REBOOT_REQUIRED	3010	A restart is required to complete the install. This message is indicative of a success."
+			else
+				logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$
+				isFatalError
+			endif
+		endif
+	endif
+endif
+
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup3264.ins
similarity index 66%
rename from CLIENT_DATA/setup32.ins
rename to CLIENT_DATA/setup3264.ins
index 902356c..69a7e3b 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -6,19 +6,28 @@
 [Actions]
 requiredWinstVersion >= "4.11.2.6"
 
-DefVar $UninstallProgram$
-DefVar $UninstallProgramOld$
-DefVar $IniFile$
+DefVar $UninstallProgram32$
+DefVar $UninstallProgramOld32$
+DefVar $IniFile32$
+DefVar $UninstallProgram64$
+DefVar $UninstallProgramOld64$
+DefVar $IniFile64$
 DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ProductId$  
 DefVar $MinimumSpace$
-DefVar $InstallDir$
+DefVar $InstallDir32$
+DefVar $InstallDir64$
 DefVar $ExitCode$
+DefVar $INST_SystemType$
+DefVar $INST_architecture$
 DefVar $OLD_VERSION$
 DefVar $OLD_CREATOR_TAG$
 DefVar $OLD_RELEASE$
 
+Set $INST_SystemType$ = GetSystemType
+set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
+
 Set $LogDir$ = "%SystemDrive%\tmp"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@@ -37,54 +46,80 @@ 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 $MinimumSpace$    = "10 MB"
+Set $MinimumSpace$    = "20 MB"
 ; the path were we find the product after the installation
-Set $InstallDir$      = "%ProgramFiles32Dir%\Defraggler"
+Set $InstallDir32$      = "%ProgramFiles32Dir%\Defraggler"
+Set $InstallDir64$      = "%ProgramFiles64Dir%\Defraggler"
 ; ----------------------------------------------------------------
 
 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 "No Space"
+	isFatalError
 	; Stop process and set installation status to failed
 else
 	comment "Show product picture"
 	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 	
-	if FileExists("%ScriptPath%\delsub32.ins")
+	if FileExists("%ScriptPath%\delsub3264.ins")
 		comment "Start uninstall sub section"
-		Sub "%ScriptPath%\delsub32.ins"
+		Sub "%ScriptPath%\delsub3264.ins"
 	endif
 	
-	Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..."
-	
-	comment "Start setup program"
-	ChangeDirectory "%SCRIPTPATH%"
-	Winbatch_install
-	Sub_check_exitcode
-	
-	comment "Copy files"
-	Files_install /32Bit
-	
-	comment "Patch Registry"
-	Registry_install /32Bit
-	
-	comment "Create shortcuts"
-	LinkFolder_install
+	comment "installing"
+
+	if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
+		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
+		comment "Start setup program"
+		ChangeDirectory "%SCRIPTPATH%"
+		Winbatch_install_32
+		Sub_check_exitcode
+		comment "Copy files"
+		Files_install_32 /32Bit
+		comment "Patch Registry"
+		Registry_install /32Bit
+		comment "Create shortcuts"
+		LinkFolder_install
+	endif
+
+	if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
+		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
+		comment "Start setup program"
+		ChangeDirectory "%SCRIPTPATH%"
+		Winbatch_install_64
+		Sub_check_exitcode
+		comment "Copy files"
+		Files_install_64 /64Bit
+		comment "Patch Registry"
+		Registry_install /64Bit
+		comment "Create shortcuts"
+		LinkFolder_install
+	endif
 	
 endif
 
-[Winbatch_install]
+[Winbatch_install_32]
 "$InstallExe$" /S
 
-[Files_install]
+[Files_install_32]
 ; copy the ini file to the InstallDir
-copy "$IniCfgFile$" "$InstallDir$"
+copy "$IniCfgFile$" "$InstallDir32$"
 
 ; Example of recursively copying some files into the installation directory:
 ;
-; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"
+; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
+
+[Winbatch_install_64]
+"$InstallExe$" /S
+
+[Files_install_64]
+; copy the ini file to the InstallDir
+copy "$IniCfgFile$" "$InstallDir64$"
+
+; Example of recursively copying some files into the installation directory:
+;
+; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$"
 
 [Registry_install]
 ; Example of setting some values of an registry key:
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall3264.ins
similarity index 68%
rename from CLIENT_DATA/uninstall32.ins
rename to CLIENT_DATA/uninstall3264.ins
index 0416116..c267a60 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall3264.ins
@@ -6,18 +6,29 @@
 [Actions]
 requiredWinstVersion >= "4.11.2.6"
 
-DefVar $UninstallProgram$
-DefVar $UninstallProgramOld$
-DefVar $IniFile$
+DefVar $UninstallProg32$
+DefVar $UninstallProgram32$
+DefVar $UninstallProgramOld32$
+DefVar $IniFile32$
+DefVar $UninstallProg64$
+DefVar $UninstallProgram64$
+DefVar $UninstallProgramOld64$
+DefVar $IniFile64$
 DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ExitCode$
 DefVar $ProductId$
-DefVar $InstallDir$
+DefVar $InstallDir32$
+DefVar $InstallDir64$
+DefVar $INST_SystemType$
+DefVar $INST_architecture$
 DefVar $OLD_VERSION$
 DefVar $OLD_CREATOR_TAG$
 DefVar $OLD_RELEASE$
 
+Set $INST_SystemType$ = GetSystemType
+set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
+
 Set $LogDir$ = "%SystemDrive%\tmp"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@@ -33,7 +44,8 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $InstallDir$      = "%ProgramFiles32Dir%\Defraggler"
+Set $InstallDir32$    = "%ProgramFiles32Dir%\Defraggler"
+Set $InstallDir64$    = "%ProgramFiles64Dir%\Defraggler"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
@@ -43,8 +55,8 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 
 Message "Uninstalling " + $ProductId$ + " ..."
 
-if FileExists("%ScriptPath%\delsub32.ins")
+if FileExists("%ScriptPath%\delsub3264.ins")
 	comment "Start uninstall sub section"
-	Sub "%ScriptPath%\delsub32.ins"
+	Sub "%ScriptPath%\delsub3264.ins"
 endif
 
diff --git a/OPSI/control b/OPSI/control
index 005630d..1c6e33c 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -21,6 +21,15 @@ 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 bf03a3a..fd87a84 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -28,5 +28,9 @@ DL_WINST_NAME[1]=InstallExe
 ICON_DL_INDEX=0
 
 OPSI_INI_SECTION[0]="X86"
-OPSI_INI_OPTION[0]="UninstallProg"
+OPSI_INI_OPTION[0]="UninstallProg32"
 OPSI_INI_VALUE[0]="uninst.exe"
+
+OPSI_INI_SECTION[1]="X86_64"
+OPSI_INI_OPTION[1]="UninstallProg64"
+OPSI_INI_VALUE[1]="uninst.exe"