diff --git a/changelog/src/main/org/apache/maven/changelog/ChangeLog.java b/changelog/src/main/org/apache/maven/changelog/ChangeLog.java
index a51d5d6f..bd5fac9a 100644
--- a/changelog/src/main/org/apache/maven/changelog/ChangeLog.java
+++ b/changelog/src/main/org/apache/maven/changelog/ChangeLog.java
@@ -503,15 +503,22 @@ public class ChangeLog
     {
         if ( clFactoryClass == null )
         {
-            if ( ( connection == null ) || ( connection.length() < 7 )
+            //Connection Format: scm:<provider>[:<provider specific connection string>]
+            if ( ( connection == null ) || ( connection.length() < 5 )
                 || !connection.startsWith( "scm:" ) )
             {
                 LOG.warn( "Connection does not appear valid" );
             }
             else
             {
-                clFactoryClass =
-                    (String) FACTORIES.get( connection.substring( 4, 7 ) );
+                int iProviderEnd = connection.indexOf( ":", 4 );
+                if ( iProviderEnd == -1 )
+                {
+                    // Connection = scm:<provider>
+                    iProviderEnd = connection.length();
+                }
+
+                clFactoryClass = (String) FACTORIES.get( connection.substring( 4, iProviderEnd ) );
             }
 
             if ( clFactoryClass == null )
diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml
index 56dd4520..3e5c3357 100644
--- a/changelog/xdocs/changes.xml
+++ b/changelog/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.9-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPCHANGELOG-72" due-to="Pascal Larin">Auto select factory from connection doesn't work if provider name length different from 3.</action>
       <action dev="ltheussl" type="add" issue="MPCHANGELOG-80" due-to="Christoph Jerolimov">Add MKS SI support.</action>
       <action dev="ltheussl" type="fix" issue="MPCHANGELOG-69">Changelog returns 0 entries on Windows with CVS (not CVSNT). New property <code>maven.changelog.quoteDate</code>.</action>
       <action dev="ltheussl" type="fix" issue="MPCHANGELOG-74">Changelog plugin creates wrong links for Subversion repositories. New property <code>maven.changelog.svn.baseurl</code>.</action>