diff --git a/idea/plugin.jelly b/idea/plugin.jelly
index 2e773098..5e4b86cf 100644
--- a/idea/plugin.jelly
+++ b/idea/plugin.jelly
@@ -3,7 +3,7 @@
 <project 
   xmlns:j="jelly:core"
   xmlns:u="jelly:util"
-  xmlns:jj="jelly:jeez">
+  xmlns:a="jelly:ant">
 
   <!--==================================================================-->
   <!-- Generate IntelliJ IDEA .project and .classpath files             -->
@@ -257,6 +257,8 @@
           <u:available file="${basedir}/CVS/Root">
           <u:loadText var="cvsRoot" file="${basedir}/CVS/Root"/>
           <u:tokenize var="cvsRootValues" delim=":">${cvsRoot}</u:tokenize>
+          <j:set var="cvsRootValuesSize" value="${size(cvsRootValues)}"/>
+          <j:if test="${cvsRootValuesSize == 3}">
           <j:set var="userServer" value="${cvsRootValues.get(1)}"/>
           <j:set var="user" value="${userServer.substring(0,userServer.indexOf('@'))}"/>
           <j:set var="server" value="${userServer.substring(userServer.indexOf('@'))}"/>
@@ -266,6 +268,18 @@
             <option name="HOST" value="${server.substring(1)}"/>
             <option name="REPOSITORY" value="${cvsRootValues.get(2)}" />
           </cvs_root>
+          </j:if>
+          <j:if test="${cvsRootValuesSize == 2}">
+          <j:set var="userServer" value="${cvsRootValues.get(0)}"/>
+          <j:set var="user" value="${userServer.substring(0,userServer.indexOf('@'))}"/>
+          <j:set var="server" value="${userServer.substring(userServer.indexOf('@'))}"/>
+          <cvs_root>
+            <option name="METHOD" value="ext" />
+            <option name="USER_NAME" value="${user}" />
+            <option name="HOST" value="${server.substring(1)}"/>
+            <option name="REPOSITORY" value="${cvsRootValues.get(1)}" />
+          </cvs_root>
+          </j:if>
           <j:set var="cvsEnabled" value="true"/>
           <j:set var="cvsPath" value="/usr/bin/cvs"/>
           </u:available>