diff --git a/cruisecontrol/plugin.jelly b/cruisecontrol/plugin.jelly
index 6f3c9843..74b754a0 100644
--- a/cruisecontrol/plugin.jelly
+++ b/cruisecontrol/plugin.jelly
@@ -55,6 +55,15 @@
   <goal name="cruisecontrol:configure"
     description="Update a Cruise Control configuration file with this project"
     prereqs="cruisecontrol:validate">
+    
+    <j:choose>
+      <j:when test="${systemScope['os.name'].startsWith('Windows')}">
+        <j:set var="mavenScriptExtension" value=".bat"/>
+      </j:when>
+      <j:otherwise>
+        <j:set var="mavenScriptExtension" value=".sh"/>
+      </j:otherwise>
+    </j:choose>    
     <x:parse var="doc"><cruisecontrol></cruisecontrol></x:parse>
     <util:available file="${maven.cruisecontrol.config}">
       <util:file var="inputFile" name="${maven.cruisecontrol.config}" />
diff --git a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
index 3b700b2e..30a188cd 100644
--- a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
+++ b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
@@ -67,7 +67,7 @@
         <j:when test="${type == 'time'}">
         <schedule>
           <maven
-            mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven"
+            mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven${mavenScriptExtension}"
             time="${maven.cruisecontrol.schedule.time}"
             goal="${maven.cruisecontrol.goals}" 
             projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
@@ -76,7 +76,7 @@
         <j:otherwise>
         <schedule interval="${maven.cruisecontrol.schedule.interval}">
           <maven
-            mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven"
+            mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven${mavenScriptExtension}"
             goal="${maven.cruisecontrol.goals}"
             projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
         </schedule>
diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml
index 21ae351a..fc6fef38 100644
--- a/cruisecontrol/xdocs/changes.xml
+++ b/cruisecontrol/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.6" date="in cvs">
+      <action dev="epugh" type="add" issue="MPCRUISECONTROL-15">Lost script extension when use "maven cruisecontrol:configure" command</action>        
       <action dev="epugh" type="add" issue="MPCRUISECONTROL-14" due-to="Marcin Gurbisz">Add more configuration, especially better handling of emails.</action>        
       <action dev="evenisse" type="add" issue="MPCRUISECONTROL-12" due-to="Alexandre Vivien">Add new properties to the maven cruisecontrol plugin. Ftp publisher, Scp publisher.</action>
     </release>