diff --git a/nsis/src/plugin-resources/templates/project.jelly b/nsis/src/plugin-resources/templates/project.jelly
index c13c319e..745487fa 100644
--- a/nsis/src/plugin-resources/templates/project.jelly
+++ b/nsis/src/plugin-resources/templates/project.jelly
@@ -31,7 +31,6 @@
 ; generated by ${user.name} from project.xml version ${pom.currentVersion}
 ; on date ${TODAY}, time ${TSTAMP}
 
-!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,6 +40,7 @@
 !define PROJECT_LICENSE_TEXT "${maven.nsis.license.text}"
 </util:available>
 !define PROJECT_NAME "${pom.name}"
+!define PROJECT_ORGANIZATION "${pom.organization.name}"
 !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.name}\${pom.name} ${pom.currentVersion}"
diff --git a/nsis/src/plugin-resources/templates/setup.jelly b/nsis/src/plugin-resources/templates/setup.jelly
index b617190b..50a49018 100644
--- a/nsis/src/plugin-resources/templates/setup.jelly
+++ b/nsis/src/plugin-resources/templates/setup.jelly
@@ -74,7 +74,7 @@ SetFont "Arial" 8
 !endif
 
 ; The default installation directory
-InstallDir "$$PROGRAMFILES\$${ORGANIZATION}\$${PROJECT_NAME} $${PROJECT_VERSION}"
+InstallDir "$$PROGRAMFILES\$${PROJECT_ORGANIZATION}\$${PROJECT_NAME} $${PROJECT_VERSION}"
 ; Registry key to check for directory (so if you upgrade, it will 
 ; overwrite the old one automatically)
 InstallDirRegKey HKLM "$${PROJECT_REG_KEY}" "Install_Dir"
diff --git a/nsis/xdocs/changes.xml b/nsis/xdocs/changes.xml
index 4c45afa3..8b1f54ea 100644
--- a/nsis/xdocs/changes.xml
+++ b/nsis/xdocs/changes.xml
@@ -26,6 +26,7 @@
   <body>
   
     <release version="1.2-SNAPSHOT" date="Unreleased">
+      <action dev="dion" type="update">Rename <code>ORGANIZATION</code> constant to <code>PROJECT_ORGANIZATION.</code></action>
       <action dev="dion" type="fix" due-to="Geoffrey">Check maven.nsis.exe exists before using it.</action>
       <action dev="dion" type="add" due-to="Geoffrey">Add faq</action>
       <action dev="dion" type="update">Add back license to project.xml after the scm plugin removed it.</action>
diff --git a/nsis/xdocs/customizing.xml b/nsis/xdocs/customizing.xml
index eb8f61f4..c0c70b99 100644
--- a/nsis/xdocs/customizing.xml
+++ b/nsis/xdocs/customizing.xml
@@ -82,7 +82,6 @@
         </p>
         <table>
           <tr><th>Constant</th>                  <th>Value</th></tr>
-          <tr><td>ORGANIZATION</td>              <td>${pom.organization}</td></tr>
           <tr><td>PROJECT_BUILD_DIR</td>         <td>${maven.build.dir}</td></tr>
           <tr><td>PROJECT_DIST_BIN_DIR</td>      <td>${maven.dist.bin.assembly.dir}</td></tr>
           <tr><td>PROJECT_DIST_DIR</td>          <td>${maven.dist.dir}</td></tr>
@@ -91,7 +90,8 @@
           <tr><td>PROJECT_LICENSE_TEXT</td>      <td>${maven.nsis.license.text}</td></tr>
           <tr><td>PROJECT_LOGO</td>              <td>${maven.nsis.logo}</td></tr>
           <tr><td>PROJECT_NAME</td>              <td>${pom.name}</td></tr>
-          <tr><td>PROJECT_REG_KEY</td>           <td>SOFTWARE\${pom.organization}\${pom.name}\${pom.currentVersion}</td></tr>
+          <tr><td>PROJECT_ORGANIZATION</td>      <td>${pom.organization.name}</td></tr>
+          <tr><td>PROJECT_REG_KEY</td>           <td>SOFTWARE\${pom.organization.name}\${pom.name}\${pom.currentVersion}</td></tr>
           <tr><td>PROJECT_REG_UNINSTALL_KEY</td> <td>Software\Microsoft\Windows\CurrentVersion\Uninstall\${pom.name} ${pom.currentVersion}</td></tr>
           <tr><td>PROJECT_STARTMENU_FOLDER</td>  <td>$$SMPROGRAMS\${pom.organization}\${pom.name} ${pom.currentVersion}</td></tr>
           <tr><td>PROJECT_URL</td>               <td>${pom.url}</td></tr>

Constant	Value
ORGANIZATION	${pom.organization}
PROJECT_BUILD_DIR	${maven.build.dir}
PROJECT_DIST_BIN_DIR	${maven.dist.bin.assembly.dir}
PROJECT_DIST_DIR	${maven.dist.dir}
PROJECT_LICENSE_TEXT	${maven.nsis.license.text}
PROJECT_LOGO	${maven.nsis.logo}
PROJECT_NAME	${pom.name}
PROJECT_REG_KEY	SOFTWARE\${pom.organization}\${pom.name}\${pom.currentVersion}
PROJECT_ORGANIZATION	${pom.organization.name}
PROJECT_REG_KEY	SOFTWARE\${pom.organization.name}\${pom.name}\${pom.currentVersion}
PROJECT_REG_UNINSTALL_KEY	Software\Microsoft\Windows\CurrentVersion\Uninstall\${pom.name} ${pom.currentVersion}
PROJECT_STARTMENU_FOLDER	$$SMPROGRAMS\${pom.organization}\${pom.name} ${pom.currentVersion}
PROJECT_URL	${pom.url}