diff --git a/cruisecontrol/plugin.jelly b/cruisecontrol/plugin.jelly
index 589a6dc1..479a0580 100644
--- a/cruisecontrol/plugin.jelly
+++ b/cruisecontrol/plugin.jelly
@@ -58,8 +58,7 @@
     </j:if>
     <j:if test="${method == 'svn'}">
       <maven:pluginVar var="root" plugin="maven-scm-plugin" property="maven.scm.svn.root"/>
-      <maven:pluginVar var="module" plugin="maven-scm-plugin" property="maven.scm.svn.module"/>
-      <j:set var="url" value="${root}/${module}"/>
+      <j:set var="url" value="${root}"/>
     </j:if>
 
     
diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml
index a87b7ca6..5da48e1a 100644
--- a/cruisecontrol/xdocs/changes.xml
+++ b/cruisecontrol/xdocs/changes.xml
@@ -26,6 +26,9 @@
   </properties>
   <body>
     <release version="1.7-SNAPSHOT" date="in SVN">
+      <action dev="brett" type="add">
+        Remove use of deprecated maven.scm.svn.module property
+      </action>
       <action dev="brett" type="add" issue="MPCRUISECONTROL-23" due-to="Philip Dodds">
         Add a Jabber publisher and configuration.
       </action>
diff --git a/gump/plugin.jelly b/gump/plugin.jelly
index e462150a..a1360c14 100644
--- a/gump/plugin.jelly
+++ b/gump/plugin.jelly
@@ -68,7 +68,9 @@
         <j:set var="moduleName" value="${scmTokens[5]}"/>
       </j:when>
       <j:when test="${scmTokens[1] == 'svn'}">
-        <j:set var="moduleName" value="${scmTokens[4]}"/>
+        <j:if test="${empty(context.getVariable('maven.gump.svn.dir'))}">
+          <ant:fail>You must specify maven.gump.svn.dir as the directory under the gump repository in SVN</ant:fail>
+        </j:if>
       </j:when>
       <j:otherwise>
         <ant:echo>Unknown SCM type ${scmTokens[1]}: you may need to manually add the repository</ant:echo>
diff --git a/gump/src/plugin-resources/module.jelly b/gump/src/plugin-resources/module.jelly
index 9b8d3f41..0b4d61ee 100755
--- a/gump/src/plugin-resources/module.jelly
+++ b/gump/src/plugin-resources/module.jelly
@@ -56,7 +56,7 @@
 
   <nag from="${maven.gump.module.name} development &lt;${pom.build.nagEmailAddress}&gt;" to="${pom.build.nagEmailAddress}"/>]]>
 
-  <j:choose><j:when test="${scmTokens[1] == 'cvs'}"><![CDATA[<cvs repository="${pom.gumpRepositoryId}" module="${moduleName}" />]]></j:when><j:when test="${scmTokens[1] == 'svn'}"><![CDATA[<svn repository="${pom.gumpRepositoryId}" dir="${moduleName}" />]]></j:when></j:choose><j:forEach var="project" items="${reactorProjects}">
+  <j:choose><j:when test="${scmTokens[1] == 'cvs'}"><![CDATA[<cvs repository="${pom.gumpRepositoryId}" module="${moduleName}" />]]></j:when><j:when test="${scmTokens[1] == 'svn'}"><![CDATA[<svn repository="${pom.gumpRepositoryId}" dir="${maven.gump.svn.dir}" />]]></j:when></j:choose><j:forEach var="project" items="${reactorProjects}">
     <j:import file="${plugin.resources}/project.jelly" inherit="true" /></j:forEach>
 </module>
 </j:whitespace>
diff --git a/gump/xdocs/changes.xml b/gump/xdocs/changes.xml
index 63088781..ddafc6c6 100644
--- a/gump/xdocs/changes.xml
+++ b/gump/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="2.0.1-SNAPSHOT" date="in SVN">
+      <action dev="brett" type="add">Add maven.gump.svn.dir property for setting the subdirectory under the svn repository</action>
       <action dev="brett" type="add">Add the ability to specify the "runtime" attribute of a dependency using the
         <code>gump.runtime</code> property</action>
       <action dev="brett" type="update">Pass ids to depends element also</action>
diff --git a/scm/plugin.jelly b/scm/plugin.jelly
index 66609f98..ea179f42 100644
--- a/scm/plugin.jelly
+++ b/scm/plugin.jelly
@@ -263,11 +263,7 @@
         <j:if test="${empty(svnRoot)}">
           <ant:fail>You must specify maven.scm.svn.root</ant:fail>
         </j:if>
-        <j:set var="svnModule" value="${maven.scm.svn.module}"/>
-        <j:if test="${empty(svnModule)}">
-          <ant:fail>You must specify maven.scm.svn.module</ant:fail>
-        </j:if>        
-      </j:when>      
+      </j:when>
       <j:otherwise>
         <ant:fail>Unknown SCM method: '${maven.scm.method}'</ant:fail>
       </j:otherwise>
@@ -318,11 +314,14 @@
       </j:if>
       <j:if test="${scmMethod == 'svn'}">          
         <j:set var="maven.scm.svn.root" value="${tokens[2]}:${tokens[3]}"/>
-        <j:set var="maven.scm.svn.module" value="${tokens[4]}"/>
-          
+        <j:set var="svnModule" value="${tokens[4]}"/>
+        <j:if test="${!empty(svnModule)}">
+          <ant:echo>DEPRECATED: using ':' to separate a module in the SVN connection string is deprecated</ant:echo>
+          <j:set var="maven.scm.svn.root" value="${maven.scm.svn.root}/${svnModule}" />
+        </j:if>
+
         <ant:echo>Using SVN repository: ${maven.scm.svn.root}</ant:echo>
-        <ant:echo>Using module: ${maven.scm.svn.module}</ant:echo>
-      </j:if>      
+      </j:if>
     </j:if>
   </goal>
 
diff --git a/scm/xdocs/properties.xml b/scm/xdocs/properties.xml
index 2ea6f5e8..35908313 100644
--- a/scm/xdocs/properties.xml
+++ b/scm/xdocs/properties.xml
@@ -190,13 +190,6 @@
               </p>
             </td>
           </tr>
-          <tr>
-            <td>maven.scm.svn.module</td>
-            <td>Yes</td>
-            <td>
-              <p>The SVN module to checkout</p>
-            </td>
-          </tr>
           <tr>
             <td>maven.scm.cvs.sticky.tag</td>
             <td>Yes</td>
