diff --git a/src/assembly/default.xml b/src/assembly/default.xml
index e632ef24be..335bfca0a8 100644
--- a/src/assembly/default.xml
+++ b/src/assembly/default.xml
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  JBoss, Home of Professional Open Source
+ 
+  Copyright 2008, Red Hat Middleware LLC, and individual contributors
+  by the @author tags. See the COPYRIGHT.txt in the distribution for a
+  full listing of individual contributors.
+ 
+  This is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of
+  the License, or (at your option) any later version.
+ 
+  This software is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public
+  License along with this software; if not, write to the Free
+  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
 <assembly>
   <id>dist</id>
   <formats>
@@ -18,10 +41,6 @@
         <include>**/*.xml</include>
         <include>**/license/**</include>
         <include>**/src/**</include>
-        <include>**/Implementation/**</include>
-        <include>**/FilesystemBased/**</include>
-        <include>**/Common/**</include>
-        <include>**/Main/**</include>
       </includes>
       <excludes>
         <exclude>**/target/**</exclude>
@@ -58,6 +77,15 @@
         <include>**/**</include>
       </includes>
     </fileSet>
+
+    <!-- Documentation (Docbook) -->
+    <fileSet>
+      <directory>target/docbook/publish/en-US</directory>
+      <outputDirectory>doc/guide</outputDirectory>
+      <includes>
+        <include>**/**</include>
+      </includes>
+    </fileSet>
   </fileSets>
 </assembly>