diff --git a/console/plugin.jelly b/console/plugin.jelly
index 69c43713..d6733397 100644
--- a/console/plugin.jelly
+++ b/console/plugin.jelly
@@ -37,9 +37,7 @@
           <log:info>${prop} = ${context.getVariable(prop)}</log:info>
         </j:when>
         <j:when test="${goal.indexOf('=') gt 0}">
-          <util:tokenize var="propertyPieces" delim="=">${goal}</util:tokenize>
-          <log:info>Setting property ${propertyPieces[0]} to ${propertyPieces[1]}</log:info>
-          <j:set var="${propertyPieces[0]}" value="${propertyPieces[1]}" scope="parent" />
+          <attainGoal name="console:set-properties" />
         </j:when>
         <j:when test="${goal=='help'}">
           <attainGoal name="console:help"/>
@@ -67,6 +65,12 @@
     </j:while>
   </goal>
 
+  <goal name="console:set-properties">
+    <util:tokenize var="propertyPieces" delim="=">${goal}</util:tokenize>
+    <log:info>Setting property ${propertyPieces[0]} to ${propertyPieces[1]}</log:info>
+    <j:set var="${propertyPieces[0]}" value="${propertyPieces[1]}" scope="parent" />
+  </goal>
+
   <goal name="console:help" description="Print the help message.">
     <log:info>
 The following commands are available:
diff --git a/console/xdocs/changes.xml b/console/xdocs/changes.xml
index 7a7272c6..87f47a80 100644
--- a/console/xdocs/changes.xml
+++ b/console/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.2-SNAPSHOT" date="in SVN">
+      <action dev="brett" type="update" issue="MPCONSOLE-10">Split property setting into a separate goal console:set-properties to allow annotation of the properties</action>
       <action dev="brett" type="remove">Removed the <code>list</code> command as it hasn't worked as expected since the early betas (goals are lazy loaded into the werkz project)</action>
       <action dev="brett" type="add">Add way to display a property value</action>
       <action dev="brett" type="update">Improve help</action>
