diff --git a/changelog/plugin.jelly b/changelog/plugin.jelly
index a0897d84..ffb16834 100644
--- a/changelog/plugin.jelly
+++ b/changelog/plugin.jelly
@@ -23,7 +23,8 @@
   xmlns:ant="jelly:ant"
   xmlns:define="jelly:define"
   xmlns:changelog="changelog"
-  xmlns:doc="doc">
+  xmlns:doc="doc"
+  xmlns:maven="jelly:maven">
 
   <goal name="maven-changelog-plugin:register">
     <j:if test="${context.getVariable('maven.mode.online') == null}">
@@ -98,4 +99,14 @@
     </j:choose>
 
   </goal>
+  
+  <goal name="changelog:create-cvspass">
+    <maven:paramCheck value="${password}" fail="true">
+You must provide a password to set for the cvs repository.
+Please run the goal again using:
+maven -Dpassword=XXXXXX changelog:create-cvspass</maven:paramCheck>
+    <echo>Setting password for ${pom.repository.cvsRoot}</echo>
+    <cvspass cvsroot="${pom.repository.cvsRoot}" password="${password}"/>
+  </goal>
+  
 </project>
diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml
index 0cbd85e6..b041a64a 100644
--- a/changelog/xdocs/changes.xml
+++ b/changelog/xdocs/changes.xml
@@ -26,6 +26,10 @@
   </properties>
   <body>
     <release version="1.5" date="in CVS">
+      <action dev="dion" type="update">
+        Add changelog:create-cvspass goal for creating the required .cvspass file
+        Add documentation on .cvspass file for CVSNT users.
+      </action>
       <action dev="brett" type="update" issue="MPCHANGELOG-31">
         Use Netbean 3.6 version of cvslib to fix cvs 1.11.2 bug.
       </action>
diff --git a/changelog/xdocs/index.xml b/changelog/xdocs/index.xml
index 20f2226e..0394a182 100644
--- a/changelog/xdocs/index.xml
+++ b/changelog/xdocs/index.xml
@@ -44,5 +44,25 @@
         document.
       </p>
     </section>
+    <section name="CVSNT users">
+      <p>
+        This plugin does <strong>not</strong> use the cvs executable on your 
+        system to access CVS, instead it uses a java library from the
+        <a href="http://www.netbeans.org">NetBeans</a> project.
+      </p>
+      <p>
+        The password to access CVS is read by the plugin from
+        <strong>${user.home}/.cvspass</strong>. If you are using CVSNT you
+        will not have this file, as CVSNT stores passwords encrypted in the 
+        registry.
+      </p>
+      <p>
+        To create this file, please execute the <code>changelog:create-cvspass</code>
+        goal, e.g.
+      </p>
+      <source>
+maven -Dpassword=XXXXXXXX changelog:create-cvspass
+      </source>
+    </section>
  </body>
 </document>
