diff --git a/cruisecontrol/plugin.jelly b/cruisecontrol/plugin.jelly
index 4c73de6a..7cbcfdf6 100644
--- a/cruisecontrol/plugin.jelly
+++ b/cruisecontrol/plugin.jelly
@@ -48,9 +48,9 @@
       <j:set var="maven.cruisecontrol.mail.defaultsuffix" value="@${tokens[1]}" />
     </j:if>
 
-    <!-- FIXME: Shouldn't this use the second element of pom.repository.connection -->
+    <!-- Compute the SCM URL to use. Note: IMO this should be done by the SCM plugin who
+         should provide a URL with this information for us to use -->
     <maven:pluginVar var="method" plugin="maven-scm-plugin" property="maven.scm.method"/>
-
     <j:if test="${method == 'cvs'}">
       <maven:pluginVar var="root" plugin="maven-scm-plugin" property="maven.scm.cvs.root"/>
       <maven:pluginVar var="module" plugin="maven-scm-plugin" property="maven.scm.cvs.module"/>
@@ -59,13 +59,14 @@
       <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:if>
-
+    <j:set var="url" value="${root}/${module}"/>
+    
     <!-- Compute the merge directory automatically if not specified by the user -->
     <maven:makeRelativePath var="relativeMavenBuildDir" basedir="${basedir}"
         path="${maven.build.dir}" separator="/"/>
     <maven:property var="maven.cruisecontrol.logs.mergedirectory" 
         name="maven.cruisecontrol.logs.mergedirectory" 
-        defaultValue="${maven.cruisecontrol.checkout.dir}/${module}/${relativeMavenBuildDir}/test-reports/"/>
+        defaultValue="${maven.cruisecontrol.checkout.dir}/${pom.artifactId}/${relativeMavenBuildDir}/test-reports/"/>
     
   </goal>
 
@@ -144,7 +145,6 @@
         <ant:mkdir dir="${maven.cruisecontrol.work.dir}"/>
         <ant:copy tofile="${maven.cruisecontrol.work.dir}/config.xml" 
             file="${maven.cruisecontrol.config}"/>
-        <attainGoal name="cruisecontrol:checkout"/>
       </j:when>
       <j:otherwise>
         <ant:echo>You need to customize maven.cruisecontrol.work.dir to the real location</ant:echo>
diff --git a/cruisecontrol/plugin.properties b/cruisecontrol/plugin.properties
index 9bf3d9b9..9a88e3d8 100644
--- a/cruisecontrol/plugin.properties
+++ b/cruisecontrol/plugin.properties
@@ -39,7 +39,7 @@ maven.cruisecontrol.schedule.time=1900
 
 # We use the root directory to search for JUnit report files so that it works
 # both in single and multiproject setups.
-maven.cruisecontrol.logs.mergedirectory=${maven.cruisecontrol.checkout.dir}/${module}
+maven.cruisecontrol.logs.mergedirectory=${maven.cruisecontrol.checkout.dir}/${pom.artifactId}
 maven.cruisecontrol.logs.pattern=TEST-*.xml
 
 maven.cruisecontrol.logs.merge=true
diff --git a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
index 49e435ff..cb734943 100644
--- a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
+++ b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
@@ -42,10 +42,10 @@
         </bootstrappers>
         <modificationset>
           <j:if test="${method == 'cvs'}">
-            <cvs cvsroot="${root}" localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${module}" />
+            <cvs cvsroot="${url}" localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${pom.artifactId}" />
           </j:if>
           <j:if test="${method == 'svn'}">
-            <svn repositoryLocation="${root}" localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${module}" />
+            <svn repositoryLocation="${url}" localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${pom.artifactId}" />
           </j:if>
           <!-- Add the list of additional directories for the classpath from ${maven.eclipse.classpath.include}-->
           <u:tokenize var="triggerProjectsSplit" delim=",">${maven.cruisecontrol.trigger.projects}</u:tokenize>
@@ -63,7 +63,7 @@
             mavenscript="${mavenScript}"
             time="${maven.cruisecontrol.schedule.time}"
             goal="${maven.cruisecontrol.goals}" 
-            projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
+            projectfile="${maven.cruisecontrol.checkout.dir}/${pom.artifactId}/project.xml"/>
         </schedule>
         </j:when>
         <j:otherwise>
@@ -71,7 +71,7 @@
           <maven
             mavenscript="${mavenScript}"
             goal="${maven.cruisecontrol.goals}"
-            projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
+            projectfile="${maven.cruisecontrol.checkout.dir}/${pom.artifactId}/project.xml"/>
         </schedule>
         </j:otherwise>
         </j:choose>
diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml
index 38770b3f..809b18b8 100644
--- a/cruisecontrol/xdocs/changes.xml
+++ b/cruisecontrol/xdocs/changes.xml
@@ -26,6 +26,10 @@
   </properties>
   <body>
     <release version="1.7" date="in SVN">
+      <action dev="vmassol" type="update">
+        Removed all dependencies on the SCM module and instead replace all
+        occurrences with <code>${pom.artifactId}</code>.
+      </action>
       <action dev="vmassol" type="add">
         Added new <code>cruisecontrol:configure-war</code> goal that generates
         a configured CruiseControl webapp WAR.