diff --git a/build.xml b/build.xml
index 7ab154c2a..be3abe58a 100644
--- a/build.xml
+++ b/build.xml
@@ -493,10 +493,11 @@ For users of JDK 1.5 at least version 1.6.2 of Ant is required.
     	 manifest="${target.dir}/manifest.mf" 
     	 filesetmanifest="skip">
         <zipfileset src="${dist.dir}/checkstyle-${version}/antlr.jar" excludes="META-INF/*"/>
-        <zipfileset src="${dist.dir}/checkstyle-${version}/commons-beanutils-core.jar" excludes="META-INF/*,overview.html"/>
+        <!-- beanutils packages parts of commons collections, exclude it here so we don't have it in checkstyle-all.jar twice -->
+    	<zipfileset src="${dist.dir}/checkstyle-${version}/commons-beanutils-core.jar" excludes="META-INF/*,org/apache/commons/collections/*,**/*.html"/>
         <zipfileset src="${dist.dir}/checkstyle-${version}/commons-collections.jar" excludes="META-INF/*"/>
         <zipfileset src="${dist.dir}/checkstyle-${version}/commons-cli.jar" excludes="META-INF/*"/>
-        <zipfileset src="${dist.dir}/checkstyle-${version}/commons-logging.jar" excludes="META-INF/*"/>
+        <zipfileset src="${dist.dir}/checkstyle-${version}/commons-logging.jar" excludes="META-INF/*,**/package.html"/>
         <zipfileset src="${dist.dir}/checkstyle-${version}/checkstyle-${version}.jar" excludes="META-INF/*"/>
     </jar>	
     <!-- copy stuff without filtering -->
diff --git a/src/xdocs/releasenotes.xml b/src/xdocs/releasenotes.xml
index 2a89f0020..ef220ec5f 100755
--- a/src/xdocs/releasenotes.xml
+++ b/src/xdocs/releasenotes.xml
@@ -9,6 +9,19 @@
   </properties>
 
   <body>
+    <section name="Release 4.4">
+      <p>Fixed Bugs:</p>
+
+      <ul>
+        <li>
+          checkstyle-all.jar contained some classes from jakarta commons-collections twice. (bug 1630361)
+        </li>
+      </ul>
+
+      <p>New features:</p>
+
+    </section>
+
     <section name="Release 4.3">
       <p>Fixed Bugs:</p>
 
