diff --git a/changelog/plugin.jelly b/changelog/plugin.jelly
index ffb16834..f3bf31af 100644
--- a/changelog/plugin.jelly
+++ b/changelog/plugin.jelly
@@ -101,8 +101,9 @@
   </goal>
   
   <goal name="changelog:create-cvspass">
-    <maven:paramCheck value="${password}" fail="true">
-You must provide a password to set for the cvs repository.
+    <maven:paramCheck value="${password}" fail="false">
+Warning: You have provided an empty password
+To 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>
diff --git a/changelog/project.xml b/changelog/project.xml
index bc373122..04769673 100644
--- a/changelog/project.xml
+++ b/changelog/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-changelog-plugin</id>
   <name>Maven Changelog Plugin</name>
-  <currentVersion>1.5</currentVersion>
+  <currentVersion>1.6-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Produce SCM changelog reports</shortDescription>
   <url>http://maven.apache.org/reference/plugins/changelog/</url>
diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml
index f9b7a292..36915c4a 100644
--- a/changelog/xdocs/changes.xml
+++ b/changelog/xdocs/changes.xml
@@ -25,6 +25,11 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    
+    <release version="1.6-SNAPSHOT" date="in CVS">
+      <action dev="dion" type="update">Allow empty passwords in create-cvspass</action>
+    </release>
+    
     <release version="1.5" date="2004-05-16">
       <action dev="dion" type="fix" due-to="Tim Shadel" issue="MPCHANGELOG-22">Parsing of windows user names (domain\user) was broken.</action>
       <action dev="dion" type="fix" due-to="Archimedes Trajano">Bad documentation for goals</action>