diff --git a/scm/plugin.jelly b/scm/plugin.jelly
index a3ee5d24..b6972688 100644
--- a/scm/plugin.jelly
+++ b/scm/plugin.jelly
@@ -20,7 +20,11 @@
       <j:set var="value" value="${pom.repository.connection}"/>
       <j:if test="${!empty(value)}">
         <!-- Use pom.repository.connection if present -->
-        <util:tokenize var="tokens" delim=":">${pom.repository.connection}</util:tokenize>
+        <j:set var="delim" value=":"/>
+        <j:if test="${value.length() gt 3}">
+          <j:set var="delim" value="${value.substring(3, 4)}"/>
+        </j:if>
+        <util:tokenize var="tokens" delim="${delim}">${pom.repository.connection}</util:tokenize>
         <j:if test="${tokens[0] != 'scm'}">
           <ant:fail>Invalid repository connection format</ant:fail>
         </j:if>
diff --git a/scm/xdocs/changes.xml b/scm/xdocs/changes.xml
index 0fae42a7..14e86c69 100644
--- a/scm/xdocs/changes.xml
+++ b/scm/xdocs/changes.xml
@@ -7,6 +7,9 @@
 
   <body>
     <release version="1.1-SNAPSHOT" date="in CVS">
+      <action dev="dion" type="update">
+        Apply MAVEN-834. Support for scm delimiters other than ':'
+      </action>
       <action dev="brett" type="fix">
         Turn off pretty printing to fix MAVEN-769 - random spaces added
         to project.xml.
