diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index d4db6ec..f4c6972 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -28,7 +28,7 @@ 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$       = "notepadpp"
+Set $ProductId$       = "notepad-plus-plus.notepad-plus-plus"
 Set $MinimumSpace$    = "20 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\Notepad++"
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index ee35b3c..dd4d9d4 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -21,7 +21,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "notepadpp"
+Set $ProductId$       = "notepad-plus-plus.notepad-plus-plus"
 Set $InstallDir$      = "%ProgramFiles32Dir%\Notepad++"
 Set $LicenseRequired$ = "false"
 Set $LicensePool$     = "p_" + $ProductId$
diff --git a/OPSI/control b/OPSI/control
index c0b66fa..5a54961 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -5,7 +5,7 @@ incremental: False
 
 [Product]
 type: localboot
-id: notepadpp
+id: notepad-plus-plus.notepad-plus-plus
 name: Notepad++
 description: Notepad++ is a free (as in "free speech" and also as in "free beer") source code editor and Notepad replacement that supports several languages.
 advice: ADVICE
diff --git a/builder-product.cfg b/builder-product.cfg
index dc2b507..da1cafe 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -1,8 +1,8 @@
 ############################
 # Setup product information 
 ############################
-PN="notepadpp"
-VERSION="6.0"
+PN="notepad-plus-plus.notepad-plus-plus"
+VERSION="6.1.2"
 RELEASE="4"
 PRIORITY="0"
 ADVICE=""
diff --git a/npp.6.0.Installer.exe.sha1sum b/npp.6.0.Installer.exe.sha1sum
deleted file mode 100644
index 8750c07..0000000
--- a/npp.6.0.Installer.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-61cc9579a42ae4b28dd8e23ff620219bc360d80c  /home/mario/.opsi-dist-cache/notepadpp-6.0/X86/npp.6.0.Installer.exe
diff --git a/npp.6.1.2.Installer.exe.sha1sum b/npp.6.1.2.Installer.exe.sha1sum
new file mode 100644
index 0000000..237acd4
--- /dev/null
+++ b/npp.6.1.2.Installer.exe.sha1sum
@@ -0,0 +1 @@
+0b98c67439e851624a694cbf9109d588d4a58593  /home/mario/.opsi-dist-cache/notepad-plus-plus.notepad-plus-plus-6.1.2/X86/npp.6.1.2.Installer.exe