diff --git a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
index 68e1dc53..30fc3634 100644
--- a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
+++ b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
@@ -37,9 +37,15 @@
           <plugin name="svn" classname="net.sourceforge.cruisecontrol.sourcecontrols.SVN"/> 
           <plugin name="svnbootstrapper" classname="net.sourceforge.cruisecontrol.bootstrappers.SVNBootstrapper"/>
         </j:if>
-        <bootstrappers>
-          <currentbuildstatusbootstrapper file="${maven.cruisecontrol.logs.dir}/${pom.artifactId}/${maven.cruisecontrol.currentbuildstatus.filename}"/>
-        </bootstrappers>
+        <listeners>
+          <currentbuildstatuslistener file="${maven.cruisecontrol.logs.dir}/${pom.artifactId}/${maven.cruisecontrol.currentbuildstatus.filename}"/>
+          <j:set var="ftpstatus" value="${maven.cruisecontrol.currentbuildstatusftppublisher}"/>
+          <j:if test="${ftpstatus == 'true'}">
+            <currentbuildstatusftplistener
+              filename="${maven.cruisecontrol.currentbuildstatusftppublisher.file}"
+              destdir="${maven.cruisecontrol.currentbuildstatusftppublisher.destDir}"/>
+          </j:if>
+        </listeners>
         <modificationset>
           <j:if test="${method == 'cvs'}">
             <cvs cvsroot="${url}" localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${pom.artifactId}" />
@@ -86,25 +92,12 @@
           </j:if>
         </log>
         <publishers>
-          <currentbuildstatuspublisher file="${maven.cruisecontrol.logs.dir}/${pom.artifactId}/${maven.cruisecontrol.currentbuildstatus.filename}"/>
          <j:set var="publishartifacts" value="${maven.cruisecontrol.artifactspublisher}"/>
          <j:if test="${publishartifacts == 'true'}">
           <artifactspublisher 
             dir="${maven.cruisecontrol.artifacts.dir}"
             dest="${maven.cruisecontrol.artifacts.dest}/${pom.artifactId}" publishOnFailure="${maven.cruisecontrol.artifactspublisher.publishOnFailure}"/>  
          </j:if>
-         <j:set var="ftpstatus" value="${maven.cruisecontrol.currentbuildstatusftppublisher}"/>
-         <j:if test="${ftpstatus == 'true'}">
-          <currentbuildstatusftppublisher
-              targetHost="${maven.cruisecontrol.ftp.targetHost}"
-              targetUser="${maven.cruisecontrol.ftp.targetUser}"
-              targetPasswd="${maven.cruisecontrol.ftp.targetPasswd}"
-              targetPort="${maven.cruisecontrol.ftp.targetPort}"
-              targetDir="${maven.cruisecontrol.ftp.targetDir}"
-              targetSeparator="${maven.cruisecontrol.ftp.targetSeparator}"
-              file="${maven.cruisecontrol.currentbuildstatusftppublisher.file}"
-              destDir="${maven.cruisecontrol.currentbuildstatusftppublisher.destDir}"/>
-         </j:if>
          <j:set var="ftppublisher" value="${maven.cruisecontrol.ftppublisher}"/>
          <j:if test="${ftppublisher == 'true'}">
           <ftppublisher
diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml
index a8f801a3..fe1df256 100644
--- a/cruisecontrol/xdocs/changes.xml
+++ b/cruisecontrol/xdocs/changes.xml
@@ -26,6 +26,7 @@
   </properties>
   <body>
     <release version="1.8-SNAPSHOT" date="In SVN">
+      <action dev="ltheussl" type="fix" issue="MPCRUISECONTROL-32">Replace deprecated <code>&lt;currentbuildstatusbootstrapper&gt;</code>, <code>&lt;currentbuildstatuspublisher&gt;</code> and <code>&lt;currentbuildstatusftppublisher&gt;</code> by <code>&lt;currentbuildstatuslistener&gt;</code> and <code>&lt;currentbuildstatusftplistener&gt;</code>.</action>
       <action dev="ltheussl" type="fix" issue="MPCRUISECONTROL-30">Add missing documentation for several properties.</action>
       <action dev="ltheussl" type="fix" issue="MPCRUISECONTROL-29">Default for <code>maven.cruisecontrol.logs.mergedirectory</code> is incorrect on the Properties page.</action>
       <action dev="ltheussl" type="fix" issue="MPCRUISECONTROL-33">Property <code>maven.cruisecontrol.goals</code> contains deprecated <code>scm:update-project</code>.</action>