diff --git a/xdoc/src/plugin-resources/templates/cvs-usage.xml b/xdoc/src/plugin-resources/templates/cvs-usage.xml
index 3a225145..49cdfee6 100644
--- a/xdoc/src/plugin-resources/templates/cvs-usage.xml
+++ b/xdoc/src/plugin-resources/templates/cvs-usage.xml
@@ -28,6 +28,8 @@
       #end
     
       #if ($repository.connection && $repository.connection != '')
+        #set ($connscm = $repository.getScmType($repository.connection))
+        #if ($connscm == 'cvs')
         #set ($conn = $repository.getCvsRoot($repository.connection, ''))
         #set ($module = $repository.getCvsModule($repository.connection))
       <section name="Anonymous CVS Access">
@@ -47,9 +49,13 @@
           Updates from within the module's directory do not need the -d parameter.
         </p>
       </section>
+        #end
       #end
 
       #if ($repository.developerConnection && $repository.developerConnection != '')
+        #set ($connscm = $repository.getScmType($repository.developerConnection))
+        #if ($connscm == 'cvs')
+
         #set ($conn = $repository.getCvsRoot($repository.developerConnection, 'username'))
         #set ($module = $repository.getCvsModule($repository.developerConnection))
         #set ($server = $repository.getCvsServer($repository.developerConnection))
@@ -73,6 +79,7 @@
         </p>
 
       </section>
+        #end
       #end
 
       #if ($repository.url && $repository.url != '')
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index dfbb139c..d75007a2 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -7,6 +7,9 @@
 
   <body>
     <release version="1.4" date="in CVS">
+      <action dev="dion" type="fix">
+        Applied Maven-756. cvs-usage.xml breaks on non-cvs scm URL
+      </action>
       <action dev="dion" type="update">Move xdoc faqs over from the wiki</action>
       <action dev="dion" type="update">update to commons-jelly-20030902.160215</action>
       <action dev='dion' type='fix'>