diff --git a/cruisecontrol/plugin.properties b/cruisecontrol/plugin.properties
index 9a88e3d8..d63385a1 100644
--- a/cruisecontrol/plugin.properties
+++ b/cruisecontrol/plugin.properties
@@ -97,3 +97,13 @@ maven.cruisecontrol.scp.statusfile=${maven.cruisecontrol.currentbuildstatus.file
 maven.cruisecontrol.artifactspublisher=false
 maven.cruisecontrol.artifacts.dir=
 maven.cruisecontrol.artifacts.dest=${maven.build.dir}/artifacts
+maven.cruisecontrol.artifactspublisher.publishOnFailure=true
+
+maven.cruisecontrol.jabberpublisher=false
+maven.cruisecontrol.jabber.host=jabber.org
+maven.cruisecontrol.jabber.username=MISSING_USERNAME
+maven.cruisecontrol.jabber.password=MISSING_PASSWORD
+maven.cruisecontrol.jabber.recipient=MISSING_RECIEPT
+maven.cruisecontrol.jabber.chatroom=false
+maven.cruisecontrol.jabber.ssl=false
+maven.cruisecontrol.jabber.buildresultsurl=false
diff --git a/cruisecontrol/project.xml b/cruisecontrol/project.xml
index d4e0561a..09cf9f56 100644
--- a/cruisecontrol/project.xml
+++ b/cruisecontrol/project.xml
@@ -99,6 +99,11 @@
       </roles>
     </developer>
   </developers>
+  <contributors>
+    <contributor>
+      <name>Philip Dodds</name>
+    </contributor>
+  </contributors>
   <dependencies>
     <dependency>
       <groupId>commons-jelly</groupId>
diff --git a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
index cb734943..eba28efb 100644
--- a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
+++ b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
@@ -91,7 +91,7 @@
          <j:if test="${publishartifacts == 'true'}">
           <artifactspublisher 
             dir="${maven.cruisecontrol.artifacts.dir}"
-            dest="${maven.cruisecontrol.artifacts.dest}/${pom.artifactId}"/>  
+            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'}">
@@ -117,6 +117,17 @@
               destDir="${maven.cruisecontrol.ftppublisher.destDir}"
               srcDir="${maven.cruisecontrol.ftppublisher.srcDir}/${pom.artifactId}"
               deleteArtifacts="${maven.cruisecontrol.ftppublisher.deleteArtifacts}"/>
+         </j:if>
+	     <j:set var="jabberpublisher" value="${maven.cruisecontrol.jabberpublisher}"/>
+            <j:if test="${jabberpublisher == 'true'}">
+         	<jabber
+	              host="${maven.cruisecontrol.jabber.host}"              
+	              username="${maven.cruisecontrol.jabber.username}"
+	              password="${maven.cruisecontrol.jabber.password}"
+	              recipient="${maven.cruisecontrol.jabber.recipient}"
+	              chatroom="${maven.cruisecontrol.jabber.chatroom}"
+	              ssl="${maven.cruisecontrol.jabber.ssl}"
+	              buildresultsurl="${maven.cruisecontrol.jabber.buildresultsurl}"/>
          </j:if>
           <htmlemail 
               skipusers="${maven.cruisecontrol.mail.skipusers}"
diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml
index 8b2bce36..a87b7ca6 100644
--- a/cruisecontrol/xdocs/changes.xml
+++ b/cruisecontrol/xdocs/changes.xml
@@ -26,6 +26,12 @@
   </properties>
   <body>
     <release version="1.7-SNAPSHOT" date="in SVN">
+      <action dev="brett" type="add" issue="MPCRUISECONTROL-23" due-to="Philip Dodds">
+        Add a Jabber publisher and configuration.
+      </action>
+      <action dev="brett" type="add" issue="MPCRUISECONTROL-23" due-to="Philip Dodds">
+        Add ability to publish only on success.
+      </action>
       <action dev="vmassol" type="update">
         Removed all dependencies on the SCM module and instead replace all
         occurrences with <code>${pom.artifactId}</code>.
diff --git a/cruisecontrol/xdocs/properties.xml b/cruisecontrol/xdocs/properties.xml
index 093d1f0a..0f7c392e 100644
--- a/cruisecontrol/xdocs/properties.xml
+++ b/cruisecontrol/xdocs/properties.xml
@@ -240,6 +240,71 @@
         </tr>    
       </table>
     </section>
+    <section name="Maven Cruise Control Plug-in Jabber Settings">
+      <table>
+       <tr>
+          <td>maven.cruisecontrol.jabberpublisher</td>
+          <td>Yes</td>
+          <td>
+            <p>Control whether to include publishing to a Jabber server. Default value is
+              <code>false</code>.</p>            
+          </td>
+        </tr>
+        <tr>
+          <td>maven.cruisecontrol.jabber.host</td>
+          <td>No</td>
+          <td>
+            <p>Default value is
+              <code>jabber.org</code>.</p>
+          </td>
+        </tr>
+        <tr>
+          <td>maven.cruisecontrol.jabber.username</td>
+          <td>No</td>
+          <td>
+            <p>The username to use to connect to the Jabber server</p>
+          </td>
+        </tr>
+        <tr>
+          <td>maven.cruisecontrol.jabber.password</td>
+          <td>No</td>
+          <td>
+            <p>The password to use to connect to the Jabber server</p>
+          </td>
+        </tr>
+        <tr>
+          <td>maven.cruisecontrol.jabber.recipient</td>
+          <td>No</td>
+          <td>
+            <p>The recipient that you wish to send the notification to</p>
+          </td>
+        </tr>
+        <tr>
+          <td>maven.cruisecontrol.jabber.chatroom</td>
+          <td>Yes</td>
+          <td>
+            <p>Whether the recipient is a chatroom.  Default value is
+              <code>false</code>.</p>
+          </td>
+        </tr>
+        <tr>
+          <td>maven.cruisecontrol.jabber.ssl</td>
+          <td>Yes</td>
+          <td>
+            <p>Whether to use SSL to connect to the Jabber server.  Default value is
+              <code>false</code>.</p>
+          </td>
+        </tr>
+        <tr>
+          <td>maven.cruisecontrol.jabber.buildresultsurl</td>
+          <td>Yes</td>
+          <td>
+            <p>Whether to include the build results URL.  Default value is
+              <code>false</code>.</p>
+          </td>
+        </tr>     
+      </table>
+    </section>
     <section name="Maven Cruise Control Plug-in FTP Publisher Settings">
       <table>
         <tr>
@@ -454,5 +519,128 @@
       </tr>
      </table>
     </section>
+    <section name="Maven Cruise Control Plug-in SCP Publisher Settings">
+     <table>
+      <tr>
+        <td>maven.cruisecontrol.scppublisher</td>
+        <td>Yes</td>
+        <td>
+          <p>Copies the XML log file from the build with a SCP command onto a remote host. Default value is
+            <code>false</code>.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>maven.cruisecontrol.scp.sourcedir</td>
+        <td>Yes</td>
+        <td>
+          <p>The directory to copy from. Default value is
+            <code>${maven.cruisecontrol.logs.dir}</code>.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>maven.cruisecontrol.scp.targetuser</td>
+        <td>Yes</td>
+        <td>
+          <p>Log in to the target machine as this user.</p>
+          <p>
+        <strong>NOTE: </strong>This property doesn't have any default value, a value is required if 
+        <code>maven.cruisecontrol.scppublisher</code> property is set to <code>true</code>.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>maven.cruisecontrol.scp.targethost</td>
+        <td>Yes</td>
+        <td>
+          <p>SCP to this machine.</p>
+          <p>
+        <strong>NOTE: </strong>This property doesn't have any default value, a value is required if 
+        <code>maven.cruisecontrol.scppublisher</code> property is set to <code>true</code>.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>maven.cruisecontrol.scp.targetlogdir</td>
+        <td>Yes</td>
+        <td>
+          <p>The directory to copy the log files. Default value is
+            <code>.</code>.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>maven.cruisecontrol.scp.targetstatusfiledir</td>
+        <td>Yes</td>
+        <td>
+          <p>The directory to copy the currentstatusfile. Default value is
+            <code>.</code>.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>maven.cruisecontrol.scp.targetseparator</td>
+        <td>Yes</td>
+        <td>
+          <p>The file separator on the target machine. Default value is
+            <code>/</code>.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>maven.cruisecontrol.scp.ssh</td>
+        <td>Yes</td>
+        <td>
+          <p>The ssh application. Default value is
+            <code>ssh</code>.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>maven.cruisecontrol.scp.file</td>
+        <td>Yes</td>
+        <td>
+          <p>The filename to copy. Default value is the current log file.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>maven.cruisecontrol.scp.statusfile</td>
+        <td>Yes</td>
+        <td>
+          <p>The statusfilename to copy. Default value is 
+          <code>${maven.cruisecontrol.currentbuildstatus.filename}</code>.</p>
+        </td>
+      </tr>
+     </table>
+    </section>
+    <section name="Maven Cruise Control Plug-in Artifact Publisher Settings">
+     <table>
+      <tr>
+        <td>maven.cruisecontrol.artifactspublisher</td>
+        <td>Yes</td>
+        <td>
+          <p>Copies the build artifacts from to a given local location. Default value is
+            <code>false</code>.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>maven.cruisecontrol.artifacts.dir</td>
+        <td>Yes</td>
+        <td>
+          <p>The directory to copy from. Default value is
+            <code>${maven.cruisecontrol.logs.dir}</code>.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>maven.cruisecontrol.artifacts.dest</td>
+        <td>Yes</td>
+        <td>
+          <p>The directory to copy to. Default value is
+            <code>${maven.build.dir}/artifacts}</code>.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>maven.cruisecontrol.artifactsPublisher.publishOnFailure</td>
+        <td>Yes</td>
+        <td>
+          <p>Whether to publish the artifacts on a failed build. Default value is
+            <code>true</code>.</p>
+        </td>
+      </tr>
+     </table>
+    </section>    
   </body>
 </document>

maven.cruisecontrol.jabberpublisher	Yes	+ Control whether to include publishing to a Jabber server. Default value is + `false`. +
maven.cruisecontrol.jabber.host	No	+ Default value is + `jabber.org`. +
maven.cruisecontrol.jabber.username	No	+ The username to use to connect to the Jabber server +
maven.cruisecontrol.jabber.password	No	+ The password to use to connect to the Jabber server +
maven.cruisecontrol.jabber.recipient	No	+ The recipient that you wish to send the notification to +
maven.cruisecontrol.jabber.chatroom	Yes	+ Whether the recipient is a chatroom. Default value is + `false`. +
maven.cruisecontrol.jabber.ssl	Yes	+ Whether to use SSL to connect to the Jabber server. Default value is + `false`. +
maven.cruisecontrol.jabber.buildresultsurl	Yes	+ Whether to include the build results URL. Default value is + `false`. +
maven.cruisecontrol.scppublisher	Yes	+ Copies the XML log file from the build with a SCP command onto a remote host. Default value is + `false`. +
maven.cruisecontrol.scp.sourcedir	Yes	+ The directory to copy from. Default value is + `${maven.cruisecontrol.logs.dir}`. +
maven.cruisecontrol.scp.targetuser	Yes	+ Log in to the target machine as this user. + + NOTE: This property doesn't have any default value, a value is required if + `maven.cruisecontrol.scppublisher` property is set to `true`. +
maven.cruisecontrol.scp.targethost	Yes	+ SCP to this machine. + + NOTE: This property doesn't have any default value, a value is required if + `maven.cruisecontrol.scppublisher` property is set to `true`. +
maven.cruisecontrol.scp.targetlogdir	Yes	+ The directory to copy the log files. Default value is + `.`. +
maven.cruisecontrol.scp.targetstatusfiledir	Yes	+ The directory to copy the currentstatusfile. Default value is + `.`. +
maven.cruisecontrol.scp.targetseparator	Yes	+ The file separator on the target machine. Default value is + `/`. +
maven.cruisecontrol.scp.ssh	Yes	+ The ssh application. Default value is + `ssh`. +
maven.cruisecontrol.scp.file	Yes	+ The filename to copy. Default value is the current log file. +
maven.cruisecontrol.scp.statusfile	Yes	+ The statusfilename to copy. Default value is + `${maven.cruisecontrol.currentbuildstatus.filename}`. +
maven.cruisecontrol.artifactspublisher	Yes	+ Copies the build artifacts from to a given local location. Default value is + `false`. +
maven.cruisecontrol.artifacts.dir	Yes	+ The directory to copy from. Default value is + `${maven.cruisecontrol.logs.dir}`. +
maven.cruisecontrol.artifacts.dest	Yes	+ The directory to copy to. Default value is + `${maven.build.dir}/artifacts}`. +
maven.cruisecontrol.artifactsPublisher.publishOnFailure	Yes	+ Whether to publish the artifacts on a failed build. Default value is + `true`. +