diff --git a/nsis/project.xml b/nsis/project.xml
index e6e0e5bc..868fefbc 100644
--- a/nsis/project.xml
+++ b/nsis/project.xml
@@ -22,7 +22,7 @@
   <pomVersion>3</pomVersion>
   <name>Maven NSIS Plugin</name>
   <artifactId>maven-nsis-plugin</artifactId>
-  <currentVersion>2.0</currentVersion>
+  <currentVersion>2.1-SNAPSHOT</currentVersion>
   <description>A plugin to generate Win32 installer programs using NSIS</description>
   <shortDescription>NSIS Plugin for Maven</shortDescription>
   <versions>
diff --git a/nsis/src/plugin-resources/templates/setup.jelly b/nsis/src/plugin-resources/templates/setup.jelly
index d4a68e6c..627b326f 100644
--- a/nsis/src/plugin-resources/templates/setup.jelly
+++ b/nsis/src/plugin-resources/templates/setup.jelly
@@ -42,6 +42,8 @@
 ; macro for the image on the install screen
 !include "BrandingImage.nsh"
 !include "JDK.nsh"
+; register environment variables in the system scope
+!define ALL_USERS
 !include "Environment.nsh"
 
 ; include project specific details
diff --git a/nsis/xdocs/changes.xml b/nsis/xdocs/changes.xml
index 94471762..21033a40 100644
--- a/nsis/xdocs/changes.xml
+++ b/nsis/xdocs/changes.xml
@@ -23,6 +23,9 @@
     <author email="brett@apache.org">Brett Porter</author>
   </properties>
   <body>
+    <release version="2.1-SNAPSHOT" date="In SVN">
+      <action dev="aheritier" type="update" issue="MPNSIS-14">Set environment variables in system scope instead of user scope.</action>
+    </release>
     <release version="2.0" date="2006-07-28">
       <action dev="dion" type="fix" due-to="Matthias Kerkhoff" issue="MPNSIS-9">Use maven.nsis.build.dir instead of maven.dist.assembly.dir.</action>
       <action dev="dion" type="fix" due-to="Matthias Kerkhoff" issue="MPNSIS-8">Fail when makensis fails.</action>
