diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml
index d6bd765b7..413f5e529 100644
--- a/openjpa-project/assembly.xml
+++ b/openjpa-project/assembly.xml
@@ -69,8 +69,14 @@
             <outputDirectory>docs/javadoc</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../openjpa-examples/src/main/java</directory>
+            <directory>../openjpa-examples</directory>
             <outputDirectory>examples</outputDirectory>
+            <excludes>
+                <exclude>**/target/**</exclude>
+                <exclude>**/*.log</exclude>
+                <exclude>**/.*</exclude>
+                <exclude>**/.*/**</exclude>
+            </excludes>
         </fileSet>
     </fileSets>
     <dependencySets>
diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml
index fa9112bfe..a26756d6c 100644
--- a/openjpa-project/pom.xml
+++ b/openjpa-project/pom.xml
@@ -123,7 +123,9 @@
                             <goal>attached</goal>
                         </goals>
                         <configuration>
-                            <descriptor>assembly.xml</descriptor>
+                            <descriptors>
+                                <descriptor>assembly.xml</descriptor>
+                            </descriptors>
                             <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
                             <workDirectory>target/work</workDirectory>
                         </configuration>
diff --git a/openjpa-project/source-assembly.xml b/openjpa-project/source-assembly.xml
index d17aff015..8c062fa71 100644
--- a/openjpa-project/source-assembly.xml
+++ b/openjpa-project/source-assembly.xml
@@ -36,6 +36,8 @@
             <excludes>
                 <exclude>**/target/**</exclude>
                 <exclude>**/*.log</exclude>
+                <exclude>**/.*</exclude>
+                <exclude>**/.*/**</exclude>
             </excludes>
         </fileSet>