diff --git a/pom.xml b/pom.xml
index ff149d8cf..d21488a08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,11 +88,13 @@
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.2-beta-1</version>
         <configuration>
           <descriptors>
             <descriptor>src/main/assembly/bin-unix.xml</descriptor>
             <descriptor>src/main/assembly/bin-win.xml</descriptor>
+            <descriptor>src/main/assembly/bin-with-deps-unix.xml</descriptor>
+            <descriptor>src/main/assembly/bin-with-deps-win.xml</descriptor>
             <descriptor>src/main/assembly/src-unix.xml</descriptor>
             <descriptor>src/main/assembly/src-win.xml</descriptor>
           </descriptors>
diff --git a/src/main/assembly/bin-unix.xml b/src/main/assembly/bin-unix.xml
index 4461fa806..f322e5f8a 100644
--- a/src/main/assembly/bin-unix.xml
+++ b/src/main/assembly/bin-unix.xml
@@ -37,11 +37,14 @@
           <binaries>
             <outputDirectory>/lib</outputDirectory>
             <unpack>false</unpack>
+            <includeDependencies>false</includeDependencies>
           </binaries>
         </moduleSet>
     </moduleSets>
     <fileSets>
         <fileSet>
+          <directory></directory>
+          <outputDirectory>/</outputDirectory>
           <includes>
             <include>README.txt</include>
             <include>LICENSE.txt</include>
diff --git a/src/main/assembly/bin-win.xml b/src/main/assembly/bin-win.xml
index ccc5333d3..8517dc7b5 100644
--- a/src/main/assembly/bin-win.xml
+++ b/src/main/assembly/bin-win.xml
@@ -37,11 +37,14 @@
           <binaries>
             <outputDirectory>/lib</outputDirectory>
             <unpack>false</unpack>
+            <includeDependencies>false</includeDependencies>
           </binaries>
         </moduleSet>
     </moduleSets>
     <fileSets>
         <fileSet>
+          <directory></directory>
+          <outputDirectory>/</outputDirectory>
           <includes>
             <include>README.txt</include>
             <include>LICENSE.txt</include>
diff --git a/src/main/assembly/bin-with-deps-unix.xml b/src/main/assembly/bin-with-deps-unix.xml
new file mode 100644
index 000000000..f0d16f4ec
--- /dev/null
+++ b/src/main/assembly/bin-with-deps-unix.xml
@@ -0,0 +1,70 @@
+<!-- 
+   $HeadURL$
+   $Revision$
+   $Date$
+
+   ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+   ====================================================================
+
+   This software consists of voluntary contributions made by many
+   individuals on behalf of the Apache Software Foundation.  For more
+   information on the Apache Software Foundation, please see
+   <http://www.apache.org/>.
+ -->
+<assembly>
+    <id>bin-with-dependencies-unix</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <moduleSets>
+        <moduleSet>
+          <binaries>
+            <outputDirectory>/lib</outputDirectory>
+            <unpack>false</unpack>
+            <includeDependencies>true</includeDependencies>
+          </binaries>
+        </moduleSet>
+    </moduleSets>
+    <fileSets>
+        <fileSet>
+          <directory></directory>
+          <outputDirectory>/</outputDirectory>
+          <includes>
+            <include>README.txt</include>
+            <include>LICENSE.txt</include>
+            <include>NOTICE.txt</include>
+            <include>RELEASE_NOTES.txt</include>
+          </includes>
+          <lineEnding>lf</lineEnding>
+        </fileSet>
+        <!-- Base module -->
+        <fileSet>
+          <directory>module-client/target/site/apidocs</directory>
+          <outputDirectory>javadoc/httpclient</outputDirectory>
+        </fileSet>
+        <fileSet>
+          <directory>module-client/src/examples/</directory>
+          <outputDirectory>examples</outputDirectory>
+          <lineEnding>lf</lineEnding>
+          <includes>
+            <include>**/*.java</include>
+          </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/src/main/assembly/bin-with-deps-win.xml b/src/main/assembly/bin-with-deps-win.xml
new file mode 100644
index 000000000..1b931a383
--- /dev/null
+++ b/src/main/assembly/bin-with-deps-win.xml
@@ -0,0 +1,70 @@
+<!-- 
+   $HeadURL$
+   $Revision$
+   $Date$
+
+   ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+   ====================================================================
+
+   This software consists of voluntary contributions made by many
+   individuals on behalf of the Apache Software Foundation.  For more
+   information on the Apache Software Foundation, please see
+   <http://www.apache.org/>.
+ -->
+<assembly>
+    <id>bin-with-dependencies-win</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <moduleSets>
+        <moduleSet>
+          <binaries>
+            <outputDirectory>/lib</outputDirectory>
+            <unpack>false</unpack>
+            <includeDependencies>true</includeDependencies>
+          </binaries>
+        </moduleSet>
+    </moduleSets>
+    <fileSets>
+        <fileSet>
+          <directory></directory>
+          <outputDirectory>/</outputDirectory>
+          <includes>
+            <include>README.txt</include>
+            <include>LICENSE.txt</include>
+            <include>NOTICE.txt</include>
+            <include>RELEASE_NOTES.txt</include>
+          </includes>
+          <lineEnding>crlf</lineEnding>
+        </fileSet>
+        <!-- Base module -->
+        <fileSet>
+          <directory>module-client/target/site/apidocs</directory>
+          <outputDirectory>javadoc/httpclient</outputDirectory>
+        </fileSet>
+        <fileSet>
+          <directory>module-client/src/examples/</directory>
+          <outputDirectory>examples</outputDirectory>
+          <lineEnding>crlf</lineEnding>
+          <includes>
+            <include>**/*.java</include>
+          </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/src/main/assembly/src-unix.xml b/src/main/assembly/src-unix.xml
index ac65a6ebf..1410d0b28 100644
--- a/src/main/assembly/src-unix.xml
+++ b/src/main/assembly/src-unix.xml
@@ -35,6 +35,8 @@
     <fileSets>
         <!-- Release materials -->
         <fileSet>
+          <directory></directory>
+          <outputDirectory>/</outputDirectory>
           <includes>
             <include>README.txt</include>
             <include>LICENSE.txt</include>
@@ -45,6 +47,8 @@
         </fileSet>
         <!-- Build files -->
         <fileSet>
+          <directory></directory>
+          <outputDirectory>/</outputDirectory>
           <includes>
             <include>*.xml</include>
           </includes>
diff --git a/src/main/assembly/src-win.xml b/src/main/assembly/src-win.xml
index 0b59ba874..f0115cbb4 100644
--- a/src/main/assembly/src-win.xml
+++ b/src/main/assembly/src-win.xml
@@ -35,6 +35,8 @@
     <fileSets>
         <!-- Release materials -->
         <fileSet>
+          <directory></directory>
+          <outputDirectory>/</outputDirectory>
           <includes>
             <include>README.txt</include>
             <include>LICENSE.txt</include>
@@ -45,6 +47,8 @@
         </fileSet>
         <!-- Build files -->
         <fileSet>
+          <directory></directory>
+          <outputDirectory>/</outputDirectory>
           <includes>
             <include>*.xml</include>
           </includes>