diff --git a/pom.xml b/pom.xml
index 4fbd0b58c..2a686ee07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -982,7 +982,7 @@
         <plugins>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.1</version>
+            <version>2.2-beta-2</version>
             <inherited>false</inherited>
             <configuration>
               <descriptors>
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
index 17d321b56..c0cc3deed 100644
--- a/src/main/assembly/src.xml
+++ b/src/main/assembly/src.xml
@@ -25,6 +25,14 @@
     <format>zip</format>
   </formats>
   <fileSets>
+    <fileSet>
+      <useDefaultExcludes>false</useDefaultExcludes>
+      <directory>.</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>**/CVS/**</include>
+      </includes>
+    </fileSet>
     <fileSet>
       <directory>.</directory>
       <outputDirectory>/</outputDirectory>