diff --git a/module-httpmime/pom.xml b/module-httpmime/pom.xml
index 5db934fd6..bc9f2ec36 100644
--- a/module-httpmime/pom.xml
+++ b/module-httpmime/pom.xml
@@ -75,6 +75,11 @@
       <artifactId>commons-io</artifactId>
       <version>${commons-io.version}</version>
     </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>${commons-logging.version}</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/src/main/assembly/bin-unix.xml b/src/main/assembly/bin-unix.xml
index f322e5f8a..9edbd045c 100644
--- a/src/main/assembly/bin-unix.xml
+++ b/src/main/assembly/bin-unix.xml
@@ -66,5 +66,18 @@
             <include>**/*.java</include>
           </includes>
         </fileSet>
+        <!-- HttpMime module -->
+        <fileSet>
+          <directory>module-httpmime/target/site/apidocs</directory>
+          <outputDirectory>javadoc/httpmime</outputDirectory>
+        </fileSet>
+        <fileSet>
+          <directory>module-httpmime/src/examples/</directory>
+          <outputDirectory>examples</outputDirectory>
+          <lineEnding>lf</lineEnding>
+          <includes>
+            <include>**/*.java</include>
+          </includes>
+        </fileSet>
     </fileSets>
 </assembly>
diff --git a/src/main/assembly/bin-win.xml b/src/main/assembly/bin-win.xml
index 8517dc7b5..3617f6efb 100644
--- a/src/main/assembly/bin-win.xml
+++ b/src/main/assembly/bin-win.xml
@@ -66,5 +66,18 @@
             <include>**/*.java</include>
           </includes>
         </fileSet>
+        <!-- HttpMime module -->
+        <fileSet>
+          <directory>module-httpmime/target/site/apidocs</directory>
+          <outputDirectory>javadoc/httpmime</outputDirectory>
+        </fileSet>
+        <fileSet>
+          <directory>module-httpmime/src/examples/</directory>
+          <outputDirectory>examples</outputDirectory>
+          <lineEnding>crlf</lineEnding>
+          <includes>
+            <include>**/*.java</include>
+          </includes>
+        </fileSet>
     </fileSets>
 </assembly>
diff --git a/src/main/assembly/bin-with-deps-unix.xml b/src/main/assembly/bin-with-deps-unix.xml
index f0d16f4ec..ba9bb5d96 100644
--- a/src/main/assembly/bin-with-deps-unix.xml
+++ b/src/main/assembly/bin-with-deps-unix.xml
@@ -66,5 +66,18 @@
             <include>**/*.java</include>
           </includes>
         </fileSet>
+        <!-- HttpMime module -->
+        <fileSet>
+          <directory>module-httpmime/target/site/apidocs</directory>
+          <outputDirectory>javadoc/httpmime</outputDirectory>
+        </fileSet>
+        <fileSet>
+          <directory>module-httpmime/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
index 1b931a383..a9a7d6c67 100644
--- a/src/main/assembly/bin-with-deps-win.xml
+++ b/src/main/assembly/bin-with-deps-win.xml
@@ -66,5 +66,18 @@
             <include>**/*.java</include>
           </includes>
         </fileSet>
+        <!-- HttpMime module -->
+        <fileSet>
+          <directory>module-httpmime/target/site/apidocs</directory>
+          <outputDirectory>javadoc/httpmime</outputDirectory>
+        </fileSet>
+        <fileSet>
+          <directory>module-httpmime/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 96782e770..2c9857ff7 100644
--- a/src/main/assembly/src-unix.xml
+++ b/src/main/assembly/src-unix.xml
@@ -60,9 +60,6 @@
           <directory>module-client/src</directory>
           <outputDirectory>module-client/src</outputDirectory>
           <lineEnding>lf</lineEnding>
-          <excludes>
-            <exclude>site/**</exclude>
-          </excludes>
         </fileSet>
         <!-- Base module build files -->
         <fileSet>
@@ -73,5 +70,20 @@
             <include>*.xml</include>
           </includes>
         </fileSet>
+        <!-- HttpMime module source and text resources -->
+        <fileSet>
+          <directory>module-httpmime/src</directory>
+          <outputDirectory>module-httpmime/src</outputDirectory>
+          <lineEnding>lf</lineEnding>
+        </fileSet>
+        <!-- HttpMime module build files -->
+        <fileSet>
+          <directory>module-httpmime</directory>
+          <outputDirectory>module-httpmime</outputDirectory>
+          <lineEnding>lf</lineEnding>
+          <includes>
+            <include>*.xml</include>
+          </includes>
+        </fileSet>
     </fileSets>
 </assembly>
diff --git a/src/main/assembly/src-win.xml b/src/main/assembly/src-win.xml
index e12ae561b..b7600d8c9 100644
--- a/src/main/assembly/src-win.xml
+++ b/src/main/assembly/src-win.xml
@@ -60,9 +60,6 @@
           <directory>module-client/src</directory>
           <outputDirectory>module-client/src</outputDirectory>
           <lineEnding>crlf</lineEnding>
-          <excludes>
-            <exclude>site/**</exclude>
-          </excludes>
         </fileSet>
         <!-- Base module build files -->
         <fileSet>
@@ -73,5 +70,20 @@
             <include>*.xml</include>
           </includes>
         </fileSet>
+        <!-- HttpMime module source and text resources -->
+        <fileSet>
+          <directory>module-httpmime/src</directory>
+          <outputDirectory>module-httpmime/src</outputDirectory>
+          <lineEnding>crlf</lineEnding>
+        </fileSet>
+        <!-- HttpMime module build files -->
+        <fileSet>
+          <directory>module-httpmime</directory>
+          <outputDirectory>module-httpmime</outputDirectory>
+          <lineEnding>crlf</lineEnding>
+          <includes>
+            <include>*.xml</include>
+          </includes>
+        </fileSet>
     </fileSets>
 </assembly>