#37 about.html cleanup.
diff --git a/org.jacoco.agent.test/about.html b/org.jacoco.agent.test/about.html
index f5d8b33..13d10cb 100644
--- a/org.jacoco.agent.test/about.html
+++ b/org.jacoco.agent.test/about.html
@@ -8,59 +8,19 @@
 <h2>About This Content</h2>
 
 <p>
-  JaCoCo is a free Java code coverage library implemented by Marc R. Hoffmann.
-  Check <a href="http://www.eclemma.org/devdoc/jacoco.html">http://www.eclemma.org/devdoc/jacoco.html</a>
-  for updates, documentation and support.
+  2009/10/12
 </p>
 
 <h3>License</h3>
 
 <p>
-  The Content in this plug-in is made available by Mountainminds GmbH &amp; Co. KG,
-  Munich. Except indicated below, the Content is provided to you under the terms
-  and conditions of the Eclipse Public License Version 1.0 (&quot;EPL&quot;).
-  A copy of the EPL is available at
+  All Content in this plug-in is made available by Mountainminds GmbH &amp; Co.
+  KG, Munich. Unless otherwise indicated below, the Content is provided to you
+  under the terms and conditions of the Eclipse Public License Version 1.0
+  (&quot;EPL&quot;). A copy of the EPL is available at
   <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+  For purposes of the EPL, "Program" will mean the Content.
 </p>
 
-<h3>Third-party Licenses</h3>
-    
-<p>
-  This bundle is based on the <a href="http://asm.objectweb.org/">ASM</a>
-  library which is distributed under the following license.  
-</p>
-
-<pre>
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/org.jacoco.agent/about.html b/org.jacoco.agent/about.html
index f5d8b33..e2186dd 100644
--- a/org.jacoco.agent/about.html
+++ b/org.jacoco.agent/about.html
@@ -8,26 +8,32 @@
 <h2>About This Content</h2>
 
 <p>
-  JaCoCo is a free Java code coverage library implemented by Marc R. Hoffmann.
-  Check <a href="http://www.eclemma.org/devdoc/jacoco.html">http://www.eclemma.org/devdoc/jacoco.html</a>
-  for updates, documentation and support.
+  2009/10/12
 </p>
 
 <h3>License</h3>
 
 <p>
-  The Content in this plug-in is made available by Mountainminds GmbH &amp; Co. KG,
-  Munich. Except indicated below, the Content is provided to you under the terms
-  and conditions of the Eclipse Public License Version 1.0 (&quot;EPL&quot;).
-  A copy of the EPL is available at
+  All Content in this plug-in is made available by Mountainminds GmbH &amp; Co.
+  KG, Munich. Unless otherwise indicated below, the Content is provided to you
+  under the terms and conditions of the Eclipse Public License Version 1.0
+  (&quot;EPL&quot;). A copy of the EPL is available at
   <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+  For purposes of the EPL, "Program" will mean the Content.
 </p>
 
-<h3>Third-party Licenses</h3>
-    
+<h3>Third Party Content</h3>
+
 <p>
-  This bundle is based on the <a href="http://asm.objectweb.org/">ASM</a>
-  library which is distributed under the following license.  
+  The Content includes items that have been sourced from third parties as set
+  out below.
+</p>
+
+<h4>ASM 3.x</h4>
+
+<p>
+  This plug-in contains the <a href="http://asm.objectweb.org/">ASM</a> library
+  which is subject to the terms and conditions of the following license: 
 </p>
 
 <pre>
diff --git a/org.jacoco.agent/buildhook.xml b/org.jacoco.agent/buildhook.xml
index 73d6316..bedc62c 100644
--- a/org.jacoco.agent/buildhook.xml
+++ b/org.jacoco.agent/buildhook.xml
@@ -51,6 +51,8 @@
 				

 			</renamedclassfileset>

 			

+			<file file="${source.bundle.dir}/about.html"/>

+			

 		</jar>

 	</target>

 	

diff --git a/org.jacoco.ant.test/about.html b/org.jacoco.ant.test/about.html
new file mode 100644
index 0000000..13d10cb
--- /dev/null
+++ b/org.jacoco.ant.test/about.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>
+  2009/10/12
+</p>
+
+<h3>License</h3>
+
+<p>
+  All Content in this plug-in is made available by Mountainminds GmbH &amp; Co.
+  KG, Munich. Unless otherwise indicated below, the Content is provided to you
+  under the terms and conditions of the Eclipse Public License Version 1.0
+  (&quot;EPL&quot;). A copy of the EPL is available at
+  <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+  For purposes of the EPL, "Program" will mean the Content.
+</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/org.jacoco.ant.test/build.properties b/org.jacoco.ant.test/build.properties
index 41eb6ad..a657887 100644
--- a/org.jacoco.ant.test/build.properties
+++ b/org.jacoco.ant.test/build.properties
@@ -1,4 +1,5 @@
 source.. = src/

 output.. = bin/

 bin.includes = META-INF/,\

-               .

+               .,\

+               about.html

diff --git a/org.jacoco.ant/about.html b/org.jacoco.ant/about.html
new file mode 100644
index 0000000..e2186dd
--- /dev/null
+++ b/org.jacoco.ant/about.html
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>
+  2009/10/12
+</p>
+
+<h3>License</h3>
+
+<p>
+  All Content in this plug-in is made available by Mountainminds GmbH &amp; Co.
+  KG, Munich. Unless otherwise indicated below, the Content is provided to you
+  under the terms and conditions of the Eclipse Public License Version 1.0
+  (&quot;EPL&quot;). A copy of the EPL is available at
+  <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+  For purposes of the EPL, "Program" will mean the Content.
+</p>
+
+<h3>Third Party Content</h3>
+
+<p>
+  The Content includes items that have been sourced from third parties as set
+  out below.
+</p>
+
+<h4>ASM 3.x</h4>
+
+<p>
+  This plug-in contains the <a href="http://asm.objectweb.org/">ASM</a> library
+  which is subject to the terms and conditions of the following license: 
+</p>
+
+<pre>
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+</pre>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/org.jacoco.ant/build.properties b/org.jacoco.ant/build.properties
index 41eb6ad..a657887 100644
--- a/org.jacoco.ant/build.properties
+++ b/org.jacoco.ant/build.properties
@@ -1,4 +1,5 @@
 source.. = src/

 output.. = bin/

 bin.includes = META-INF/,\

-               .

+               .,\

+               about.html

diff --git a/org.jacoco.ant/buildhook.xml b/org.jacoco.ant/buildhook.xml
index 2be40b2..441da3f 100644
--- a/org.jacoco.ant/buildhook.xml
+++ b/org.jacoco.ant/buildhook.xml
@@ -18,15 +18,9 @@
 	<target name="custompackage">

 		<property name="result.dist.bundle.jar.file" location="${result.dist.lib.dir}/${manifest.Bundle-SymbolicName}_${qualified.bundle.version}.jar"/>

 		<mkdir dir="${result.dist.lib.dir}"/>

-		<jar destfile="${result.dist.bundle.jar.file}" level="9">

-			<manifest>

-				<attribute name="Implementation-Title" value="JaCoCo Ant Tasks"/>

-				<attribute name="Implementation-Vendor" value="Mountainminds GmbH &amp; Co. KG"/>

-				<attribute name="Implementation-Version" value="${qualified.bundle.version}"/>

-			</manifest>

+		<jar destfile="${result.dist.bundle.jar.file}" manifest="${result.temp.bundle.manifest.file}" level="9">

 			<fileset dir="${result.tmp.bundle.classes.dir}"/>

-			<fileset file="${source.bundle.dir}/about.html"/>

-			<fileset file="${result.dist.lib.dir}/jacocoagent.jar"/>

+			<file file="${source.bundle.dir}/about.html"/>

 		</jar>

 

 		<!-- create the all-in-one Ant JAR -->

@@ -43,8 +37,9 @@
 				<attribute name="Implementation-Vendor" value="Mountainminds GmbH &amp; Co. KG"/>

 				<attribute name="Implementation-Version" value="${qualified.bundle.version}"/>

 			</manifest>		

+			<file file="${source.bundle.dir}/about.html"/>

+			<file file="${result.dist.lib.dir}/jacocoagent.jar"/>

 			<fileset dir="${result.tmp.bundle.classes.dir}"/>

-			<fileset file="${result.dist.lib.dir}/jacocoagent.jar"/>

 			<fileset dir="${toString:bundle-org.jacoco.report}" excludes="**/*.class"/>

 			

 			<!-- Just add those classes we really need -->

diff --git a/org.jacoco.build/about.html b/org.jacoco.build/about.html
index f5d8b33..13d10cb 100644
--- a/org.jacoco.build/about.html
+++ b/org.jacoco.build/about.html
@@ -8,59 +8,19 @@
 <h2>About This Content</h2>
 
 <p>
-  JaCoCo is a free Java code coverage library implemented by Marc R. Hoffmann.
-  Check <a href="http://www.eclemma.org/devdoc/jacoco.html">http://www.eclemma.org/devdoc/jacoco.html</a>
-  for updates, documentation and support.
+  2009/10/12
 </p>
 
 <h3>License</h3>
 
 <p>
-  The Content in this plug-in is made available by Mountainminds GmbH &amp; Co. KG,
-  Munich. Except indicated below, the Content is provided to you under the terms
-  and conditions of the Eclipse Public License Version 1.0 (&quot;EPL&quot;).
-  A copy of the EPL is available at
+  All Content in this plug-in is made available by Mountainminds GmbH &amp; Co.
+  KG, Munich. Unless otherwise indicated below, the Content is provided to you
+  under the terms and conditions of the Eclipse Public License Version 1.0
+  (&quot;EPL&quot;). A copy of the EPL is available at
   <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+  For purposes of the EPL, "Program" will mean the Content.
 </p>
 
-<h3>Third-party Licenses</h3>
-    
-<p>
-  This bundle is based on the <a href="http://asm.objectweb.org/">ASM</a>
-  library which is distributed under the following license.  
-</p>
-
-<pre>
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/org.jacoco.build/build.properties b/org.jacoco.build/build.properties
index 41eb6ad..a657887 100644
--- a/org.jacoco.build/build.properties
+++ b/org.jacoco.build/build.properties
@@ -1,4 +1,5 @@
 source.. = src/

 output.. = bin/

 bin.includes = META-INF/,\

-               .

+               .,\

+               about.html

diff --git a/org.jacoco.build/buildbundle.xml b/org.jacoco.build/buildbundle.xml
index f6a5398..14ca675 100644
--- a/org.jacoco.build/buildbundle.xml
+++ b/org.jacoco.build/buildbundle.xml
@@ -58,7 +58,7 @@
 		<mkdir dir="${result.dist.lib.dir}"/>

 		<jar destfile="${result.dist.bundle.jar.file}" manifest="${result.temp.bundle.manifest.file}" level="9">

 			<fileset dir="${result.tmp.bundle.classes.dir}"/>

-			<fileset file="${source.bundle.dir}/about.html"/>

+			<file file="${source.bundle.dir}/about.html"/>

 		</jar>

 	</target>

 	

diff --git a/org.jacoco.core.test/about.html b/org.jacoco.core.test/about.html
index f5d8b33..13d10cb 100644
--- a/org.jacoco.core.test/about.html
+++ b/org.jacoco.core.test/about.html
@@ -8,59 +8,19 @@
 <h2>About This Content</h2>
 
 <p>
-  JaCoCo is a free Java code coverage library implemented by Marc R. Hoffmann.
-  Check <a href="http://www.eclemma.org/devdoc/jacoco.html">http://www.eclemma.org/devdoc/jacoco.html</a>
-  for updates, documentation and support.
+  2009/10/12
 </p>
 
 <h3>License</h3>
 
 <p>
-  The Content in this plug-in is made available by Mountainminds GmbH &amp; Co. KG,
-  Munich. Except indicated below, the Content is provided to you under the terms
-  and conditions of the Eclipse Public License Version 1.0 (&quot;EPL&quot;).
-  A copy of the EPL is available at
+  All Content in this plug-in is made available by Mountainminds GmbH &amp; Co.
+  KG, Munich. Unless otherwise indicated below, the Content is provided to you
+  under the terms and conditions of the Eclipse Public License Version 1.0
+  (&quot;EPL&quot;). A copy of the EPL is available at
   <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+  For purposes of the EPL, "Program" will mean the Content.
 </p>
 
-<h3>Third-party Licenses</h3>
-    
-<p>
-  This bundle is based on the <a href="http://asm.objectweb.org/">ASM</a>
-  library which is distributed under the following license.  
-</p>
-
-<pre>
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/org.jacoco.core/about.html b/org.jacoco.core/about.html
index f5d8b33..13d10cb 100644
--- a/org.jacoco.core/about.html
+++ b/org.jacoco.core/about.html
@@ -8,59 +8,19 @@
 <h2>About This Content</h2>
 
 <p>
-  JaCoCo is a free Java code coverage library implemented by Marc R. Hoffmann.
-  Check <a href="http://www.eclemma.org/devdoc/jacoco.html">http://www.eclemma.org/devdoc/jacoco.html</a>
-  for updates, documentation and support.
+  2009/10/12
 </p>
 
 <h3>License</h3>
 
 <p>
-  The Content in this plug-in is made available by Mountainminds GmbH &amp; Co. KG,
-  Munich. Except indicated below, the Content is provided to you under the terms
-  and conditions of the Eclipse Public License Version 1.0 (&quot;EPL&quot;).
-  A copy of the EPL is available at
+  All Content in this plug-in is made available by Mountainminds GmbH &amp; Co.
+  KG, Munich. Unless otherwise indicated below, the Content is provided to you
+  under the terms and conditions of the Eclipse Public License Version 1.0
+  (&quot;EPL&quot;). A copy of the EPL is available at
   <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+  For purposes of the EPL, "Program" will mean the Content.
 </p>
 
-<h3>Third-party Licenses</h3>
-    
-<p>
-  This bundle is based on the <a href="http://asm.objectweb.org/">ASM</a>
-  library which is distributed under the following license.  
-</p>
-
-<pre>
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/org.jacoco.doc/about.html b/org.jacoco.doc/about.html
index f5d8b33..13d10cb 100644
--- a/org.jacoco.doc/about.html
+++ b/org.jacoco.doc/about.html
@@ -8,59 +8,19 @@
 <h2>About This Content</h2>
 
 <p>
-  JaCoCo is a free Java code coverage library implemented by Marc R. Hoffmann.
-  Check <a href="http://www.eclemma.org/devdoc/jacoco.html">http://www.eclemma.org/devdoc/jacoco.html</a>
-  for updates, documentation and support.
+  2009/10/12
 </p>
 
 <h3>License</h3>
 
 <p>
-  The Content in this plug-in is made available by Mountainminds GmbH &amp; Co. KG,
-  Munich. Except indicated below, the Content is provided to you under the terms
-  and conditions of the Eclipse Public License Version 1.0 (&quot;EPL&quot;).
-  A copy of the EPL is available at
+  All Content in this plug-in is made available by Mountainminds GmbH &amp; Co.
+  KG, Munich. Unless otherwise indicated below, the Content is provided to you
+  under the terms and conditions of the Eclipse Public License Version 1.0
+  (&quot;EPL&quot;). A copy of the EPL is available at
   <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+  For purposes of the EPL, "Program" will mean the Content.
 </p>
 
-<h3>Third-party Licenses</h3>
-    
-<p>
-  This bundle is based on the <a href="http://asm.objectweb.org/">ASM</a>
-  library which is distributed under the following license.  
-</p>
-
-<pre>
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/org.jacoco.doc/build.properties b/org.jacoco.doc/build.properties
index 5e37285..58e347f 100644
--- a/org.jacoco.doc/build.properties
+++ b/org.jacoco.doc/build.properties
@@ -1 +1,2 @@
-bin.includes = META-INF/

+bin.includes = META-INF/,\

+               about.html

diff --git a/org.jacoco.report.test/about.html b/org.jacoco.report.test/about.html
index f5d8b33..ba179dd 100644
--- a/org.jacoco.report.test/about.html
+++ b/org.jacoco.report.test/about.html
@@ -8,59 +8,79 @@
 <h2>About This Content</h2>
 
 <p>
-  JaCoCo is a free Java code coverage library implemented by Marc R. Hoffmann.
-  Check <a href="http://www.eclemma.org/devdoc/jacoco.html">http://www.eclemma.org/devdoc/jacoco.html</a>
-  for updates, documentation and support.
+  2009/10/12
 </p>
 
 <h3>License</h3>
 
 <p>
-  The Content in this plug-in is made available by Mountainminds GmbH &amp; Co. KG,
-  Munich. Except indicated below, the Content is provided to you under the terms
-  and conditions of the Eclipse Public License Version 1.0 (&quot;EPL&quot;).
-  A copy of the EPL is available at
+  All Content in this plug-in is made available by Mountainminds GmbH &amp; Co.
+  KG, Munich. Unless otherwise indicated below, the Content is provided to you
+  under the terms and conditions of the Eclipse Public License Version 1.0
+  (&quot;EPL&quot;). A copy of the EPL is available at
   <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+  For purposes of the EPL, "Program" will mean the Content.
 </p>
 
-<h3>Third-party Licenses</h3>
-    
+<h3>Third Party Content</h3>
+
 <p>
-  This bundle is based on the <a href="http://asm.objectweb.org/">ASM</a>
-  library which is distributed under the following license.  
+  The Content includes items that have been sourced from third parties as set
+  out below.
 </p>
 
-<pre>
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
+<h4>XHTML 1.0 DTD</h4>
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+<p>
+  This plug-in contains the
+  <a href="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">XHTML 1.0 DTD</a>
+  which is subject to the terms and conditions of the following license: 
+</p>
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+<p>
+  <b>W3C<sup>&reg;</sup> SOFTWARE NOTICE AND LICENSE</b><br/>
+  <a href="http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231">http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</a>
+</p>
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
+<p>This work (and included software, documentation such as READMEs, or other
+related items) is being provided by the copyright holders under the following
+license. By obtaining, using and/or copying this work, you (the licensee)
+agree that you have read, understood, and will comply with the following
+terms and conditions.</p>
 
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
+<p>Permission to copy, modify, and distribute this software and its
+documentation, with or without modification,&nbsp;for any purpose and without
+fee or royalty is hereby granted, provided that you include the following on
+ALL copies of the software and documentation or portions thereof, including
+modifications:</p>
+<ol>
+  <li>The full text of this NOTICE in a location viewable to users of the
+    redistributed or derivative work.</li>
+  <li>Any pre-existing intellectual property disclaimers, notices, or terms
+    and conditions. If none exist, the <a
+    href="copyright-software-short-notice-20021231.html">W3C Software Short
+    Notice</a> should be included (hypertext is preferred, text is permitted)
+    within the body of any redistributed or derivative code.</li>
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
+  <li>Notice of any changes or modifications to the files, including the date
+    changes were made. (We recommend you provide URIs to the location from
+    which the code is derived.)</li>
+</ol>
+
+<p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
+MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
+ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
+
+<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+DOCUMENTATION.</p>
+
+<p>The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to the software without specific, written
+prior permission. Title to copyright in this software and any associated
+documentation will at all times remain with copyright holders.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.jacoco.report.test/build.properties b/org.jacoco.report.test/build.properties
index 41eb6ad..a657887 100644
--- a/org.jacoco.report.test/build.properties
+++ b/org.jacoco.report.test/build.properties
@@ -1,4 +1,5 @@
 source.. = src/

 output.. = bin/

 bin.includes = META-INF/,\

-               .

+               .,\

+               about.html

diff --git a/org.jacoco.report/about.html b/org.jacoco.report/about.html
index f5d8b33..13d10cb 100644
--- a/org.jacoco.report/about.html
+++ b/org.jacoco.report/about.html
@@ -8,59 +8,19 @@
 <h2>About This Content</h2>
 
 <p>
-  JaCoCo is a free Java code coverage library implemented by Marc R. Hoffmann.
-  Check <a href="http://www.eclemma.org/devdoc/jacoco.html">http://www.eclemma.org/devdoc/jacoco.html</a>
-  for updates, documentation and support.
+  2009/10/12
 </p>
 
 <h3>License</h3>
 
 <p>
-  The Content in this plug-in is made available by Mountainminds GmbH &amp; Co. KG,
-  Munich. Except indicated below, the Content is provided to you under the terms
-  and conditions of the Eclipse Public License Version 1.0 (&quot;EPL&quot;).
-  A copy of the EPL is available at
+  All Content in this plug-in is made available by Mountainminds GmbH &amp; Co.
+  KG, Munich. Unless otherwise indicated below, the Content is provided to you
+  under the terms and conditions of the Eclipse Public License Version 1.0
+  (&quot;EPL&quot;). A copy of the EPL is available at
   <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+  For purposes of the EPL, "Program" will mean the Content.
 </p>
 
-<h3>Third-party Licenses</h3>
-    
-<p>
-  This bundle is based on the <a href="http://asm.objectweb.org/">ASM</a>
-  library which is distributed under the following license.  
-</p>
-
-<pre>
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/org.jacoco.report/build.properties b/org.jacoco.report/build.properties
index 41eb6ad..a657887 100644
--- a/org.jacoco.report/build.properties
+++ b/org.jacoco.report/build.properties
@@ -1,4 +1,5 @@
 source.. = src/

 output.. = bin/

 bin.includes = META-INF/,\

-               .

+               .,\

+               about.html