diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 1d9c8da..bad2931 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -52,7 +52,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 Set $MinimumSpace$    = "1 MB"
 ; the path were we find the product after the installation
 Set $InstallDir32$      = "%ProgramFiles32Dir%\Notepad++"
-Set $InstallDir64$      = "%ProgramFiles32Dir%\Notepad++"
+Set $InstallDir64$      = "%ProgramFiles64Dir%\Notepad++"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
@@ -113,7 +113,7 @@ else
 endif
 
 [Winbatch_install_32]
-"$InstallExe$" /S
+"$Install32Exe$" /S
 
 [Dosbatch_replace_32]
 @echo off
@@ -136,7 +136,7 @@ copy "$IniCfgFile$" "$InstallDir32$"
 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
 
 [Winbatch_install_64]
-"$InstallExe$" /S
+"$Install64Exe$" /S
 
 [Dosbatch_replace_64]
 @echo off
diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins
index f0ce39f..f0a9e9a 100644
--- a/CLIENT_DATA/uninstall3264.ins
+++ b/CLIENT_DATA/uninstall3264.ins
@@ -43,7 +43,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
 Set $InstallDir32$    = "%ProgramFiles32Dir%\Notepad++"
-Set $InstallDir64$    = "%ProgramFiles32Dir%\Notepad++"
+Set $InstallDir64$    = "%ProgramFiles64Dir%\Notepad++"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
diff --git a/builder-product.cfg b/builder-product.cfg
index 0534ecd..803f7c0 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -5,7 +5,7 @@ VENDOR="notepad-plus-plus.org"
 PN="notepadpp.notepadpp"
 NAME="Notepad++"
 DESCRIPTION="Notepad++ is a free source code editor and Notepad replacement that supports several languages."
-VERSION="6.9.2"
+VERSION="7.1"
 RELEASE="4"
 PRIORITY="0"
 ADVICE=""
@@ -17,14 +17,19 @@ DL_FILE[0]="notepad-256_32-150x150.png"
 DL_SOURCE[0]="http://www.technologyforlawyers.info/wp-content/uploads/2009/02/notepad-256_32-150x150.png"
 
 DL_FILE[1]="npp.${VERSION}.Installer.exe"
-DL_SOURCE[1]="https://notepad-plus-plus.org/repository/6.x/${VERSION}/npp.${VERSION}.Installer.exe"
+DL_SOURCE[1]="https://notepad-plus-plus.org/repository/7.x/${VERSION}/npp.${VERSION}.Installer.exe"
 DL_ARCH[1]="X86"
-DL_WINST_NAME[1]="InstallExe"
+DL_WINST_NAME[1]="Install32Exe"
 
-DL_FILE[2]="npplauncher-${VERSION}.zip"
-DL_SOURCE[2]="http://download.przemoc.net/npplauncher.zip"
-DL_ARCH[2]="X86"
-DL_EXTRACT_FORMAT[2]="unzip"
+DL_FILE[2]="npp.${VERSION}.Installer.x64.exe"
+DL_SOURCE[2]="https://notepad-plus-plus.org/repository/7.x/${VERSION}/npp.${VERSION}.Installer.x64.exe"
+DL_ARCH[2]="X86_64"
+DL_WINST_NAME[2]="Install64Exe"
+
+DL_FILE[3]="npplauncher-${VERSION}.zip"
+DL_SOURCE[3]="http://download.przemoc.net/npplauncher.zip"
+DL_ARCH[3]="X86"
+DL_EXTRACT_FORMAT[3]="unzip"
 
 OPSI_INI_SECTION[0]="X86"
 OPSI_INI_OPTION[0]="UninstallProg32"
diff --git a/npp.6.9.2.Installer.exe.sha1sum b/npp.6.9.2.Installer.exe.sha1sum
deleted file mode 100644
index bdee8fe..0000000
--- a/npp.6.9.2.Installer.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-6a54e0e8c8dbfca68abe3cbe66d99c66ced59cea  /home/mario/.opsi-dist-cache/notepadpp.notepadpp-6.9.2/X86/npp.6.9.2.Installer.exe
diff --git a/npp.7.1.Installer.exe.sha1sum b/npp.7.1.Installer.exe.sha1sum
new file mode 100644
index 0000000..f86a04e
--- /dev/null
+++ b/npp.7.1.Installer.exe.sha1sum
@@ -0,0 +1 @@
+83a58f88a471e0b45d95bec96e89780c31721f6b  /home/mario/.opsi-dist-cache/notepadpp.notepadpp-7.1/X86/npp.7.1.Installer.exe
diff --git a/npp.7.1.Installer.x64.exe.sha1sum b/npp.7.1.Installer.x64.exe.sha1sum
new file mode 100644
index 0000000..0fd3294
--- /dev/null
+++ b/npp.7.1.Installer.x64.exe.sha1sum
@@ -0,0 +1 @@
+a5933ee842b2d03ad41f9f6123613780fc57e93f  /home/mario/.opsi-dist-cache/notepadpp.notepadpp-7.1/X86_64/npp.7.1.Installer.x64.exe
diff --git a/npplauncher-6.9.2.zip.sha1sum b/npplauncher-6.9.2.zip.sha1sum
deleted file mode 100644
index 7dd47e5..0000000
--- a/npplauncher-6.9.2.zip.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-562aca0927e41b161b8c1f5abef0d2b94852e31c  /home/mario/.opsi-dist-cache/notepadpp.notepadpp-6.9.2/X86/npplauncher-6.9.2.zip
diff --git a/npplauncher-7.1.zip.sha1sum b/npplauncher-7.1.zip.sha1sum
new file mode 100644
index 0000000..4c9c60c
--- /dev/null
+++ b/npplauncher-7.1.zip.sha1sum
@@ -0,0 +1 @@
+da39a3ee5e6b4b0d3255bfef95601890afd80709  /home/mario/.opsi-dist-cache/notepadpp.notepadpp-7.1/X86/npplauncher-7.1.zip