diff --git a/build.xml b/build.xml
index 9fe09459b3..fa5d6a6aaa 100644
--- a/build.xml
+++ b/build.xml
@@ -859,9 +859,10 @@ some of its classes - at present JMeter can only run from jar files.
     	</manifest>
     </jar>
 
-    <!-- http -->
+    <!-- http without HtmlParserHTMLParser -->
     <jar jarfile="${dest.jar}/ApacheJMeter_http.jar" manifest="${src.dir}/MANIFEST">
-      <fileset dir="${build.http}" includes="**/*.class" />
+      <fileset dir="${build.http}" includes="**/*.class" 
+      	excludes="**/HtmlParserHTMLParser.class"/>
       <fileset dir="${src.http}" includes="**/*.properties" />
         <metainf dir="." includes="LICENSE,NOTICE"/>
     	<manifest>
@@ -872,6 +873,18 @@ some of its classes - at present JMeter can only run from jar files.
     	</manifest>
     </jar>
     
+    <!-- HtmlParserHTMLParser -->
+    <jar jarfile="${lib.dir}/htmlparserparser.jar" manifest="${src.dir}/MANIFEST">
+      <fileset dir="${build.http}" includes="**/HtmlParserHTMLParser.class"/>
+        <metainf dir="." includes="LICENSE,NOTICE"/>
+    	<manifest>
+           <attribute name="Built-By" value="${user.name}"/>
+           <attribute name="Implementation-Version" value="${jmeter.version}"/>
+           <attribute name="X-Compile-Source-JDK" value="${src.java.version}"/>
+           <attribute name="X-Compile-Target-JDK" value="${target.java.version}"/>
+    	</manifest>
+    </jar>
+  	    
     <!-- ftp -->
     <jar jarfile="${dest.jar}/ApacheJMeter_ftp.jar" manifest="${src.dir}/MANIFEST">
       <fileset dir="${build.ftp}" includes="**/*.class" />
@@ -1087,6 +1100,7 @@ some of its classes - at present JMeter can only run from jar files.
     <include name="${extras.dir}/**"/>
     <include name="${lib.dir}/jorphan.jar"/>
     <include name="${lib.dir}/htmlparser.jar"/>
+    <include name="${lib.dir}/htmlparserparser.jar"/>
     <include name="${lib.dir}/junit/test.jar"/>
   </patternset>
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 79e4a200a1..c0b9cd84ae 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -115,6 +115,8 @@ The XSL stylesheets also now accept either "rc" or "rs"</li>
 <li>Updated to Commons Collections 3.1</li>
 <li>Improved formatting of Request Data in Tree View</li>
 <li>Expanded user documentation</li>
+<li>Added MANIFEST, NOTICE and LICENSE to all jars</li>
+<li>Extract htmlparser interface into separate jarfile to make it possible to replace the parser</li>
 </ul>
 
 <hr/>