diff --git a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
index 33726a0d..8857a745 100644
--- a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
+++ b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
@@ -2,8 +2,9 @@
 
 <jsl:stylesheet select="$doc"
   xmlns:jsl="jelly:jsl"
-  xmlns:x="jelly:xml"
   xmlns:j="jelly:core"
+  xmlns:maven="jelly:maven"
+  xmlns:x="jelly:xml"
   xmlns="dummy" trim="false">
   <jsl:template match="cruisecontrol" trim="false">
     <jsl:copy>
@@ -13,12 +14,16 @@
           <currentbuildstatusbootstrapper file="${maven.cruisecontrol.logs.dir}/currentbuildstatus.txt"/>
         </bootstrappers>
         <modificationset>
-          <j:if test="${pom.getPluginContext('maven-scm-plugin').getVariable('maven.scm.method') == 'cvs'}">
-          <cvs cvsroot="${pom.getPluginContext('maven-scm-plugin').getVariable('maven.scm.cvs.root')}" localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${pom.getPluginContext('maven-scm-plugin').getVariable('maven.scm.cvs.module')}" />
+          <!-- FIXME: Shouldn't this use the second element of pom.repository.connection -->
+          <maven:pluginVar var="method" plugin='maven-scm-plugin' property='maven.scm.method' />
+          <maven:pluginVar var="module" plugin='maven-scm-plugin' property='maven.scm.cvs.module' />
+          <j:if test="${method == 'cvs'}">
+            <maven:pluginVar var="root" plugin='maven-scm-plugin' property='maven.scm.cvs.root' />
+            <cvs cvsroot="${root}" localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${module}" />
           </j:if>
         </modificationset>
         <schedule interval="${maven.cruisecontrol.schedule.interval}">
-          <maven mavenscript="${maven.home}/bin/maven" goal="${maven.cruisecontrol.goals}" projectfile="${maven.cruisecontrol.checkout.dir}/${pom.getPluginContext('maven-scm-plugin').getVariable('maven.scm.cvs.module')}/project.xml"/>
+          <maven mavenscript="${maven.home}/bin/maven" goal="${maven.cruisecontrol.goals}" projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
         </schedule>
         <publishers>
           <currentbuildstatuspublisher file="${maven.cruisecontrol.logs.dir}/currentbuildstatus.txt"/>