diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3f6602a828..9d5ac27a6a 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -65,6 +65,10 @@
       <groupId>${pom.groupId}</groupId>
       <artifactId>activemq-console</artifactId>
     </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-fileserver</artifactId>
+    </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>activemq-optional</artifactId>
diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/unix-bin.xml
index c83d6cbca5..6a7fe0c7a3 100644
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ b/assembly/src/main/descriptors/unix-bin.xml
@@ -126,6 +126,12 @@
       </excludes>
     </fileSet>
 
+    <!-- the file server -->
+    <fileSet>
+      <directory>../activemq-fileserver/src/main/webapp</directory>
+      <outputDirectory>/webapps/fileserver</outputDirectory>
+    </fileSet>
+
   </fileSets>
   <dependencySets>
     <dependencySet>
diff --git a/assembly/src/main/descriptors/windows-bin.xml b/assembly/src/main/descriptors/windows-bin.xml
index 46aa220389..54d2bb81e7 100644
--- a/assembly/src/main/descriptors/windows-bin.xml
+++ b/assembly/src/main/descriptors/windows-bin.xml
@@ -130,6 +130,12 @@
         <exclude>**/applicationContext.xml</exclude>
       </excludes>
     </fileSet>
+
+    <!-- the file server -->
+    <fileSet>
+      <directory>../activemq-fileserver/src/main/webapp</directory>
+      <outputDirectory>/webapps/fileserver</outputDirectory>
+    </fileSet>
   </fileSets>
 
   <dependencySets>