diff --git a/scm/plugin.jelly b/scm/plugin.jelly
index 144c369f..a2847e3f 100644
--- a/scm/plugin.jelly
+++ b/scm/plugin.jelly
@@ -209,7 +209,8 @@
     
     <j:set var="goals" value="${maven.scm.bootstrap.goals}"/>
     <j:if test="${empty(goals)}">
-      <i:ask question="What goals are you using to build?" answer="maven.scm.bootstrap.goals" default="multiproject:deploy" />  
+      <i:ask question="What goals are you using to build?" answer="goals" default="multiproject:deploy" />
+      <j:set var="maven.scm.bootstrap.goals" value="${goals.trim()}"/>
     </j:if>
 
     <attainGoal name="scm:bootstrap-project" />
diff --git a/scm/xdocs/changes.xml b/scm/xdocs/changes.xml
index 7e200f68..1bb1ef52 100644
--- a/scm/xdocs/changes.xml
+++ b/scm/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.4.1-SNAPSHOT" date="in CVS">
+      <action dev="dion" type="fix" issue="MPSCM-16">Trim goals after prompting from the user</action>
       <action dev="dion" type="add" issue="MPSCM-20">Add scm:cvs-create-patch goal to help in creating patches</action>
       <action dev="carlos" type="fix" issue="MPSCM-13">Set default <code>maven.scm.method</code> to cvs</action>
     </release>