diff --git a/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java b/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java
index 066a3711..79ce5533 100644
--- a/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java
+++ b/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java
@@ -83,7 +83,7 @@ import org.apache.tools.ant.types.Commandline;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @author <a href="mailto:pete-apache-dev@kazmier.com">Pete Kazmier</a>
  * @version 
- * $Id: CvsChangeLogGenerator.java,v 1.1 2003/01/24 03:44:53 jvanzyl Exp $
+ * $Id: CvsChangeLogGenerator.java,v 1.2 2003/02/17 20:53:42 bwalding Exp $
  */
 class CvsChangeLogGenerator extends AbstractChangeLogGenerator
 {
@@ -101,7 +101,15 @@ class CvsChangeLogGenerator extends AbstractChangeLogGenerator
             throw new IllegalArgumentException("repository connection string"
                 + " not specified");
         }
-        StringTokenizer tokenizer = new StringTokenizer(getConnection(), ":");
+        
+        String connection = getConnection();
+        if (connection.length() < 4) {  
+            throw new IllegalArgumentException("repository connection string doesn't start with scm<delim>");
+        }
+        
+        String inputDelim = connection.substring(3, 4);
+            
+        StringTokenizer tokenizer = new StringTokenizer(getConnection(), inputDelim);
         if (tokenizer.countTokens() < 6) 
         {
             throw new IllegalArgumentException("repository connection string"