diff --git a/webserver/plugin.jelly b/webserver/plugin.jelly
index 79be13f6..37df2cf0 100644
--- a/webserver/plugin.jelly
+++ b/webserver/plugin.jelly
@@ -241,6 +241,10 @@
         value="${context.getVariable('maven.webserver.dir.path')}" />
       <ant:filter token="maven.webserver.root"
         value="${context.getVariable('maven.webserver.root.path')}" />
+      <ant:filter token="maven.webserver.user"
+        value="${context.getVariable('maven.webserver.user')}" />
+      <ant:filter token="maven.webserver.group"
+        value="${context.getVariable('maven.webserver.group')}" />
 
       <!-- allow integration with the properties of the appserver plugin -->
       <ant:filter token="maven.appserver.home"
@@ -609,4 +613,4 @@ Webserver already cleaned!
     </j:choose>
   </goal>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/webserver/plugin.properties b/webserver/plugin.properties
index 22ab1e6e..1ac9936d 100644
--- a/webserver/plugin.properties
+++ b/webserver/plugin.properties
@@ -103,3 +103,10 @@ maven.webserver.fullname=${maven.webserver.name}-${maven.webserver.version}
 maven.webserver.conf.dir=${maven.conf.dir}/webserver/${maven.webserver.fullname}
 
 
+#-------------------------------------------------------#
+# OPTIONNAL PROPERTIES RESOLVING TOKENS IN HTTPD.CONF   #
+#-------------------------------------------------------#
+# The user and group to run httpd as
+maven.webserver.user=apache
+maven.webserver.group=apache
+
diff --git a/webserver/project.xml b/webserver/project.xml
index b63351c2..879f8ef5 100644
--- a/webserver/project.xml
+++ b/webserver/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-webserver-plugin</id>
   <name>Maven Webserver Plugin</name>
-  <currentVersion>2.0</currentVersion>
+  <currentVersion>2.1-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Manage web servers</shortDescription>
   <url>http://maven.apache.org/reference/plugins/webserver/</url>
diff --git a/webserver/xdocs/changes.xml b/webserver/xdocs/changes.xml
new file mode 100644
index 00000000..498291bb
--- /dev/null
+++ b/webserver/xdocs/changes.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<document>
+  <properties>
+    <title>Changes</title>
+    <author email="dion@multitask.com.au">dIon Gillard</author>
+  </properties>
+  <body>
+    <release version="2.1-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="add" issue="MPWEBSERVER-1" due-to="Guillaume Lasnier">Add user and group properties</action>
+    </release>
+    <release version="2.0" date="2004-03-07"></release>
+  </body>
+</document>
diff --git a/webserver/xdocs/properties.xml b/webserver/xdocs/properties.xml
index d9885d27..a629158c 100644
--- a/webserver/xdocs/properties.xml
+++ b/webserver/xdocs/properties.xml
@@ -150,6 +150,22 @@
             would like your server instance to serve files from.</p>
           </td>
         </tr>
+        <tr>
+          <td>maven.webserver.user</td>
+          <td>Yes</td>
+          <td>
+            <p>Default value is <code>apache</code>.</p>
+            <p>This is the user that Apache should run as.</p>
+          </td>
+        </tr>
+        <tr>
+          <td>maven.webserver.group</td>
+          <td>Yes</td>
+          <td>
+            <p>Default value is <code>apache</code>.</p>
+            <p>This is the group that Apache should run as.</p>
+          </td>
+        </tr>
 
 
         <!-- test related -->
@@ -186,4 +202,4 @@
       </table>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>
