diff --git a/war/plugin.jelly b/war/plugin.jelly
index a451bc8c..dee41688 100644
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@@ -95,10 +95,9 @@
 
     <echo>Assembling webapp ${pom.artifactId}</echo>
 
-    <property name="webapp.build" value="${maven.war.build.dir}/${pom.artifactId}"/>
-    <mkdir dir="${webapp.build}"/>
+    <mkdir dir="${maven.war.webapp.dir}"/>
 
-    <property name="webapp.build.webinf" value="${webapp.build}/WEB-INF"/>
+    <property name="webapp.build.webinf" value="${maven.war.webapp.dir}/WEB-INF"/>
     <mkdir dir="${webapp.build.webinf}"/>
 
     <property name="webapp.build.lib" value="${webapp.build.webinf}/lib"/>
@@ -108,7 +107,7 @@
     <mkdir dir="${webapp.build.classes}"/>
 
     <j:if test="${webSourcesPresent == 'true'}">
-      <copy todir="${webapp.build}">
+      <copy todir="${maven.war.webapp.dir}">
         <fileset dir="${maven.war.src}"/>
       </copy>
     </j:if>
diff --git a/war/plugin.properties b/war/plugin.properties
index c5168e54..bc4d23cd 100644
--- a/war/plugin.properties
+++ b/war/plugin.properties
@@ -12,6 +12,9 @@ maven.war.webxml=${maven.war.src}/WEB-INF/web.xml
 # Note: Classes are relative to build.dir
 maven.war.classes.includes=**
 maven.war.classes.excludes=**/package.html
-# Location where the webapp or the war will be created. Defaults to
+# Location where the war will be created. Defaults to
 # ${maven.build.dir}
 maven.war.build.dir = ${maven.build.dir}
+# Location where the webapp will be created. Defaults to
+# ${maven.war.build.dir}/${pom.artifactId}
+maven.war.webapp.dir = ${maven.war.build.dir}/${pom.artifactId}
diff --git a/war/xdocs/properties.xml b/war/xdocs/properties.xml
index 280a6eae..77e5fac0 100644
--- a/war/xdocs/properties.xml
+++ b/war/xdocs/properties.xml
@@ -50,10 +50,18 @@
           <td>maven.war.build.dir</td>
           <td>Yes</td>
           <td>
-			Directory where the webapp and war will be generated. It defaults
+			Directory where the war will be generated. It defaults
 			to <code>${maven.build.dir}</code>.
           </td>
         </tr>
+        <tr>
+          <td>maven.war.webapp.dir</td>
+          <td>Yes</td>
+          <td>
+              Directory where the webapp will be generated. It defaults to
+              <code>${maven.war.build.dir}/${pom.artifactId}</code>.
+          </td>
+        </tr>
       </table>
     </section>
     <section name="Including Jars in the Webapp">