diff --git a/nsis/src/plugin-resources/templates/project.jelly b/nsis/src/plugin-resources/templates/project.jelly
index 91b6d1ef..ac6065cf 100644
--- a/nsis/src/plugin-resources/templates/project.jelly
+++ b/nsis/src/plugin-resources/templates/project.jelly
@@ -31,7 +31,7 @@
 ; generated by ${user.name} from project.xml version ${pom.currentVersion}
 ; on date ${TODAY}, time ${TSTAMP}
 
-!define ORGANIZATION "${pom.organization}"
+!define ORGANIZATION "${pom.organization.name}"
 !define PROJECT_BUILD_DIR "${build}"
 !define PROJECT_DIST_BIN_DIR "${maven.dist.bin.assembly.dir}"
 !define PROJECT_DIST_DIR "${maven.dist.dir}"
@@ -41,9 +41,9 @@
 !define PROJECT_LICENSE_TEXT "${maven.nsis.license.text}"
 </util:available>
 !define PROJECT_NAME "${pom.name}"
-!define PROJECT_REG_KEY "SOFTWARE\${pom.organization}\${pom.name}\${pom.currentVersion}"
+!define PROJECT_REG_KEY "SOFTWARE\${pom.organization.name}\${pom.name}\${pom.currentVersion}"
 !define PROJECT_REG_UNINSTALL_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${pom.name} ${pom.currentVersion}"
-!define PROJECT_STARTMENU_FOLDER "$$SMPROGRAMS\${pom.organization}\${pom.name} ${pom.currentVersion}"
+!define PROJECT_STARTMENU_FOLDER "$$SMPROGRAMS\${pom.organization.name}\${pom.name} ${pom.currentVersion}"
 !define PROJECT_URL "${pom.url}"
 !define PROJECT_VERSION "${pom.currentVersion}"
 <j:set var="logo" value="${maven.nsis.logo}"/>
diff --git a/nsis/xdocs/changes.xml b/nsis/xdocs/changes.xml
index 5476ce27..2ea9a626 100644
--- a/nsis/xdocs/changes.xml
+++ b/nsis/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.1-SNAPSHOT" date="in CVS">
+      <action dev="dion" type="fix">Use pom.organization.name instead of pom.organization.</action>
       <action dev="dion" type="update" issue="MPNSIS-6" due-to="Geoffrey">
         Add PROJECT_URL to constants.
       </action>