diff --git a/bundleplugin/doc/site/bundleall-mojo.html b/bundleplugin/doc/site/bundleall-mojo.html
index 7bca28f..68d522b 100644
--- a/bundleplugin/doc/site/bundleall-mojo.html
+++ b/bundleplugin/doc/site/bundleall-mojo.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Feb 11, 2012 -->
+<!-- Generated by Apache Maven Doxia at Jun 8, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -11,7 +11,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20120211" />
+    <meta name="Date-Revision-yyyymmdd" content="20130608" />
     <meta http-equiv="Content-Language" content="en" />
         
   </head>
@@ -28,7 +28,7 @@
             
         
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2012-02-11</span>
+        <span id="publishDate">Last Published: 2013-06-08</span>
                   &nbsp;| <span id="projectVersion">Version: 2.4.0-SNAPSHOT</span>
                       </div>
             <div class="xright">        
@@ -93,7 +93,7 @@
         <li>Requires a Maven project to be executed.</li>
         <li>Requires dependency resolution of artifacts in scope: <tt>test</tt>.</li>
         <li>The goal is thread-safe and supports parallel builds.</li>
-        <li>Binds by default to the lifecycle phase: <tt>package</tt>.</li>
+        <li>Binds by default to the <a class="externalLink" href="http://maven.apache.org/ref/current/maven-core/lifecycles.html">lifecycle phase</a>: <tt>package</tt>.</li>
       </ul>
       <div class="section"><h3>Required Parameters<a name="Required_Parameters"></a></h3>
         <table class="bodyTable" border="0">
@@ -107,13 +107,13 @@
             <td><b><a href="#buildDirectory">buildDirectory</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>-</tt></td>
-            <td>The directory for the generated JAR.<br /></td>
+            <td>The directory for the generated JAR.<br /><b>User property is</b>: <tt>project.build.directory</tt>.</td>
           </tr>
           <tr class="a">
             <td><b><a href="#outputDirectory">outputDirectory</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>-</tt></td>
-            <td>The directory for the generated bundles.<br /></td>
+            <td>The directory for the generated bundles.<br /><b>User property is</b>: <tt>project.build.outputDirectory</tt>.</td>
           </tr>
         </table>
       </div>
@@ -149,46 +149,59 @@
             <td><b><a href="#dumpClasspath">dumpClasspath</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>-</tt></td>
-            <td>File where the BND class-path will be dumped<br /></td>
+            <td>File where the BND class-path will be dumped<br /><b>User property is</b>: <tt>dumpClasspath</tt>.</td>
           </tr>
           <tr class="b">
             <td><b><a href="#dumpInstructions">dumpInstructions</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>-</tt></td>
-            <td>File where the BND instructions will be dumped<br /></td>
+            <td>File where the BND instructions will be dumped<br /><b>User property is</b>: <tt>dumpInstructions</tt>.</td>
           </tr>
           <tr class="a">
             <td><b><a href="#excludeDependencies">excludeDependencies</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>-</tt></td>
             <td>Comma separated list of artifactIds to exclude from the dependency
-classpath passed to BND (use &quot;true&quot; to exclude everything)<br /></td>
+classpath passed to BND (use &quot;true&quot; to exclude everything)<br /><b>User property is</b>: <tt>excludeDependencies</tt>.</td>
           </tr>
           <tr class="b">
+            <td><b><a href="#finalName">finalName</a></b></td>
+            <td><tt>String</tt></td>
+            <td><tt>-</tt></td>
+            <td>Final name of the bundle (without classifier or extension)<br /><b>User property is</b>: <tt>project.build.finalName</tt>.</td>
+          </tr>
+          <tr class="a">
             <td><b><a href="#ignoreMissingArtifacts">ignoreMissingArtifacts</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>-</tt></td>
             <td>Ignore missing artifacts that are not required by current project
 but are required by the transitive dependencies.<br /></td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#instructions">instructions</a></b></td>
             <td><tt>Map</tt></td>
             <td><tt>-</tt></td>
             <td>The BND instructions for the bundle.<br /></td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#manifestLocation">manifestLocation</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>-</tt></td>
-            <td>Directory where the manifest will be written<br /><b>Default value is</b>: <tt>${project.build.outputDirectory}/META-INF</tt>.</td>
+            <td>Directory where the manifest will be written<br /><b>Default value is</b>: <tt>${project.build.outputDirectory}/META-INF</tt>.<br /><b>User property is</b>: <tt>manifestLocation</tt>.</td>
+          </tr>
+          <tr class="b">
+            <td><b><a href="#packaging">packaging</a></b></td>
+            <td><tt>String</tt></td>
+            <td><tt>-</tt></td>
+            <td>Packaging type of the bundle to be installed. For example, &quot;jar&quot;.
+Defaults to none which means use the same packaging as the project.<br /></td>
           </tr>
           <tr class="a">
             <td><b><a href="#rebuildBundle">rebuildBundle</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>-</tt></td>
             <td>When true, generate the manifest by rebuilding the full bundle in
-memory<br /></td>
+memory<br /><b>User property is</b>: <tt>rebuildBundle</tt>.</td>
           </tr>
           <tr class="b">
             <td><b><a href="#supportedProjectTypes">supportedProjectTypes</a></b></td>
@@ -200,13 +213,13 @@
             <td><b><a href="#unpackBundle">unpackBundle</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>-</tt></td>
-            <td>When true, unpack the bundle contents to the outputDirectory<br /></td>
+            <td>When true, unpack the bundle contents to the outputDirectory<br /><b>User property is</b>: <tt>unpackBundle</tt>.</td>
           </tr>
           <tr class="b">
             <td><b><a href="#wrapImportPackage">wrapImportPackage</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>-</tt></td>
-            <td>Import-Package to be used when wrapping dependencies.<br /><b>Default value is</b>: <tt>*</tt>.</td>
+            <td>Import-Package to be used when wrapping dependencies.<br /><b>Default value is</b>: <tt>*</tt>.<br /><b>User property is</b>: <tt>wrapImportPackage</tt>.</td>
           </tr>
         </table>
       </div>
@@ -221,7 +234,7 @@
         <ul>
           <li><b>Type</b>: <tt>java.lang.String</tt></li>
           <li><b>Required</b>: <tt>Yes</tt></li>
-          <li><b>Expression</b>: <tt>${project.build.directory}</tt></li>
+          <li><b>User Property</b>: <tt>project.build.directory</tt></li>
         </ul><hr /><p><b><a name="classifier">classifier</a>:</b></p>
         <div>Classifier type of the bundle to be installed. For example,
 &quot;jdk14&quot;. Defaults to none which means this is the project's main
@@ -239,20 +252,26 @@
         <ul>
           <li><b>Type</b>: <tt>java.io.File</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${dumpClasspath}</tt></li>
+          <li><b>User Property</b>: <tt>dumpClasspath</tt></li>
         </ul><hr /><p><b><a name="dumpInstructions">dumpInstructions</a>:</b></p>
         <div>File where the BND instructions will be dumped</div>
         <ul>
           <li><b>Type</b>: <tt>java.io.File</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${dumpInstructions}</tt></li>
+          <li><b>User Property</b>: <tt>dumpInstructions</tt></li>
         </ul><hr /><p><b><a name="excludeDependencies">excludeDependencies</a>:</b></p>
         <div>Comma separated list of artifactIds to exclude from the dependency
 classpath passed to BND (use &quot;true&quot; to exclude everything)</div>
         <ul>
           <li><b>Type</b>: <tt>java.lang.String</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${excludeDependencies}</tt></li>
+          <li><b>User Property</b>: <tt>excludeDependencies</tt></li>
+        </ul><hr /><p><b><a name="finalName">finalName</a>:</b></p>
+        <div>Final name of the bundle (without classifier or extension)</div>
+        <ul>
+          <li><b>Type</b>: <tt>java.lang.String</tt></li>
+          <li><b>Required</b>: <tt>No</tt></li>
+          <li><b>User Property</b>: <tt>project.build.finalName</tt></li>
         </ul><hr /><p><b><a name="ignoreMissingArtifacts">ignoreMissingArtifacts</a>:</b></p>
         <div>Ignore missing artifacts that are not required by current project
 but are required by the transitive dependencies.</div>
@@ -269,21 +288,27 @@
         <ul>
           <li><b>Type</b>: <tt>java.io.File</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${manifestLocation}</tt></li>
+          <li><b>User Property</b>: <tt>manifestLocation</tt></li>
           <li><b>Default</b>: <tt>${project.build.outputDirectory}/META-INF</tt></li>
         </ul><hr /><p><b><a name="outputDirectory">outputDirectory</a>:</b></p>
         <div>The directory for the generated bundles.</div>
         <ul>
           <li><b>Type</b>: <tt>java.io.File</tt></li>
           <li><b>Required</b>: <tt>Yes</tt></li>
-          <li><b>Expression</b>: <tt>${project.build.outputDirectory}</tt></li>
+          <li><b>User Property</b>: <tt>project.build.outputDirectory</tt></li>
+        </ul><hr /><p><b><a name="packaging">packaging</a>:</b></p>
+        <div>Packaging type of the bundle to be installed. For example, &quot;jar&quot;.
+Defaults to none which means use the same packaging as the project.</div>
+        <ul>
+          <li><b>Type</b>: <tt>java.lang.String</tt></li>
+          <li><b>Required</b>: <tt>No</tt></li>
         </ul><hr /><p><b><a name="rebuildBundle">rebuildBundle</a>:</b></p>
         <div>When true, generate the manifest by rebuilding the full bundle in
 memory</div>
         <ul>
           <li><b>Type</b>: <tt>boolean</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${rebuildBundle}</tt></li>
+          <li><b>User Property</b>: <tt>rebuildBundle</tt></li>
         </ul><hr /><p><b><a name="supportedProjectTypes">supportedProjectTypes</a>:</b></p>
         <div>Project types which this plugin supports.</div>
         <ul>
@@ -294,13 +319,13 @@
         <ul>
           <li><b>Type</b>: <tt>boolean</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${unpackBundle}</tt></li>
+          <li><b>User Property</b>: <tt>unpackBundle</tt></li>
         </ul><hr /><p><b><a name="wrapImportPackage">wrapImportPackage</a>:</b></p>
         <div>Import-Package to be used when wrapping dependencies.</div>
         <ul>
           <li><b>Type</b>: <tt>java.lang.String</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Expression</b>: <tt>${wrapImportPackage}</tt></li>
+          <li><b>User Property</b>: <tt>wrapImportPackage</tt></li>
           <li><b>Default</b>: <tt>*</tt></li>
         </ul>
       </div>
@@ -313,7 +338,7 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2006-2012
+      <div class="xright">Copyright &#169;                    2006-2013
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All Rights Reserved.