diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub64.ins
similarity index 98%
rename from CLIENT_DATA/delsub32.ins
rename to CLIENT_DATA/delsub64.ins
index 4a4baca..fa0d2d4 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub64.ins
@@ -30,10 +30,10 @@ if FileExists($UninstallProgram$)
 endif
 
 comment "Delete files"
-Files_uninstall /32Bit
+Files_uninstall /64Bit
 
 comment "Cleanup registry"
-Registry_uninstall /32Bit
+Registry_uninstall /64Bit
 
 comment "Delete program shortcuts"
 LinkFolder_uninstall
diff --git a/CLIENT_DATA/opsi-bluegriffon.bluegriffon.ini b/CLIENT_DATA/opsi-bluegriffon.bluegriffon.ini
index 41585d5..30b815f 100644
--- a/CLIENT_DATA/opsi-bluegriffon.bluegriffon.ini
+++ b/CLIENT_DATA/opsi-bluegriffon.bluegriffon.ini
@@ -1,5 +1,3 @@
-[X86]
-
 [COMMON]
 PN=name
 VERSION=version
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup64.ins
similarity index 96%
rename from CLIENT_DATA/setup32.ins
rename to CLIENT_DATA/setup64.ins
index 018306c..43818d4 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup64.ins
@@ -39,7 +39,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; no white space use '-' as a seperator
 Set $MinimumSpace$    = "20 MB"
 ; the path were we find the product after the installation
-Set $InstallDir$      = "%ProgramFiles32Dir%\BlueGriffon"
+Set $InstallDir$      = "%ProgramFiles64Dir%\BlueGriffon"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
@@ -52,9 +52,9 @@ else
 	comment "Show product picture"
 	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 	
-	if FileExists("%ScriptPath%\delsub32.ins")
+	if FileExists("%ScriptPath%\delsub64.ins")
 		comment "Start uninstall sub section"
-		Sub "%ScriptPath%\delsub32.ins"
+		Sub "%ScriptPath%\delsub64.ins"
 	endif
 	
 	Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..."
@@ -65,10 +65,10 @@ else
 	Sub_check_exitcode
 	
 	comment "Copy files"
-	Files_install /32Bit
+	Files_install /64Bit
 	
 	comment "Patch Registry"
-	Registry_install /32Bit
+	Registry_install /64Bit
 	
 	comment "Create shortcuts"
 	LinkFolder_install
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall64.ins
similarity index 91%
rename from CLIENT_DATA/uninstall32.ins
rename to CLIENT_DATA/uninstall64.ins
index c97a7a6..00a27ea 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall64.ins
@@ -33,7 +33,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $InstallDir$      = "%ProgramFiles32Dir%\BlueGriffon"
+Set $InstallDir$      = "%ProgramFiles64Dir%\BlueGriffon"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
@@ -43,8 +43,8 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 
 Message "Uninstalling " + $ProductId$ + " ..."
 
-if FileExists("%ScriptPath%\delsub32.ins")
+if FileExists("%ScriptPath%\delsub64.ins")
 	comment "Start uninstall sub section"
-	Sub "%ScriptPath%\delsub32.ins"
+	Sub "%ScriptPath%\delsub64.ins"
 endif
 
diff --git a/OPSI/control b/OPSI/control
index 48b5f43..847dbe0 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -13,8 +13,8 @@ version: 4.0.2
 priority: 0
 licenseRequired: False
 productClasses: 
-setupScript: setup32.ins
-uninstallScript: uninstall32.ins
+setupScript: setup64.ins
+uninstallScript: uninstall64.ins
 updateScript: 
 alwaysScript: 
 onceScript: 
diff --git a/bluegriffon-2.3.1.win32-installer.exe.sha1sum b/bluegriffon-2.3.1.win32-installer.exe.sha1sum
deleted file mode 100644
index df0dab6..0000000
--- a/bluegriffon-2.3.1.win32-installer.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-ce50d3b97e568d9dff3d2a999107289408461d83  /home/mario/.opsi-dist-cache/bluegriffon.bluegriffon-2.3.1/X86/bluegriffon-2.3.1.win32-installer.exe
diff --git a/bluegriffon-2.4.1.win-x86_64.exe.sha1sum b/bluegriffon-2.4.1.win-x86_64.exe.sha1sum
new file mode 100644
index 0000000..9fcb642
--- /dev/null
+++ b/bluegriffon-2.4.1.win-x86_64.exe.sha1sum
@@ -0,0 +1 @@
+59ecc7b8170dc99dded57a6bbece38db0108ab36  /home/mario/.opsi-dist-cache/bluegriffon.bluegriffon-2.4.1/X86/bluegriffon-2.4.1.win-x86_64.exe
diff --git a/builder-product.cfg b/builder-product.cfg
index d8deaa4..96c1f5d 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -5,7 +5,7 @@ VENDOR="bluegriffon.org"
 PN="bluegriffon.bluegriffon"
 NAME="BlueGriffon"
 DESCRIPTION="The next-generation Web Editor based on the rendering engine of Firefox."
-VERSION="2.3.1"
+VERSION="2.4.1"
 RELEASE="3"
 PRIORITY="0"
 ADVICE=""
@@ -17,8 +17,8 @@ TYPE="public"
 DL_FILE[0]="bglogo.png"
 DL_SOURCE[0]="http://osx.wdfiles.com/local--files/icon:bglogo/bglogo.png"
 
-DL_FILE[1]="bluegriffon-${VERSION}.win32-installer.exe"
-DL_SOURCE[1]="http://bluegriffon.org/freshmeat/${VERSION}/bluegriffon-${VERSION}.win32-installer.exe"
+DL_FILE[1]="bluegriffon-${VERSION}.win-x86_64.exe"
+DL_SOURCE[1]="http://bluegriffon.org/freshmeat/${VERSION}/bluegriffon-${VERSION}.win-x86_64.exe"
 DL_ARCH[1]="X86"
 DL_WINST_NAME[1]=InstallExe