diff --git a/org.jacoco.build/build.xml b/org.jacoco.build/build.xml
index 9364b17..b567174 100644
--- a/org.jacoco.build/build.xml
+++ b/org.jacoco.build/build.xml
@@ -36,6 +36,10 @@
 	<property name="jacoco.home.url" value="http://www.eclemma.org/jacoco"/>
 	<property name="copyright.years" value="2009, 2010"/>
 	
+    <property name="sign.keystore.alias" value="mtnminds"/>
+	<property name="sign.tsa.url" value="https://timestamp.geotrust.com/tsa"/>
+	<property name="sign.tsa.cert" value="mtnminds"/>
+	
 	<tstamp>
 		<format property="build.date" pattern="yyyy/MM/dd" timezone="GMT+0"/>
 		<format property="build.qualifier" pattern="yyyyMMddHHmmss" timezone="GMT+0"/>
@@ -115,7 +119,7 @@
 	
 	<target name="rebuild" depends="clean,build"/>
 	
-	<target name="deliver" depends="rebuild">
+	<target name="deliver" depends="clean">
 		<fail message="JaCoCo delivery only allowed with default target.">
 			<condition>
 				<not>
@@ -123,6 +127,10 @@
 				</not>
 			</condition>
 		</fail>
+	    <fail message="Please specify property 'sign.keystore.file'" unless="sign.keystore.file"/>
+		<input addproperty="sign.keystore.password">Keystore password:</input>
+
+		<runallbundlebuilds target="deliver"/>
 		<property prefix="core.manifest." file="${result.tmp.dir}/org.jacoco.core/MANIFEST.MF"/>
 		<property name="result.zip.file" location="${result.dir}/jacoco-${core.manifest.Bundle-Version}.zip"/>
 		<zip destfile="${result.zip.file}" level="9">
diff --git a/org.jacoco.build/buildbundle.xml b/org.jacoco.build/buildbundle.xml
index c764366..7473c6e 100644
--- a/org.jacoco.build/buildbundle.xml
+++ b/org.jacoco.build/buildbundle.xml
@@ -179,5 +179,29 @@
 	     =================================================================== -->
 	
 	<target name="build" depends="compile,package,verify,doc,legal"/>
+
+	
+	<!-- =================================================================== 
+	     SIGN 
+	     =================================================================== -->
+
+	<target name="sign" depends="package">
+		<signjar keystore="${sign.keystore.file}" 
+			     storepass="${sign.keystore.password}"
+			     alias="${sign.keystore.alias}"
+			     tsaurl="${sign.tsa.url}"
+			     tsacert="${sign.tsa.cert}"
+			     lazy="true">
+			<fileset dir="${result.dist.lib.dir}" includes="*.jar" erroronmissingdir="false"/>
+		</signjar>
+	</target>
+
+	
+	<!-- =================================================================== 
+	     DELIVER 
+	     =================================================================== -->
+
+	<target name="deliver" depends="build,sign"/>
+
 	
 </project>
\ No newline at end of file
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index dc53f5e..6a08123 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -22,15 +22,16 @@
 
 <h3>New Features</h3>
 <ul>
-  <li>Report Ant task issues a warning if source files are provided but class
-      files do not contain debug information to collect line numbers
-      (SF #3024486).</li>
+  <li>The <code>report</code> Ant task issues a warning if source files are
+      provided but class files do not contain debug information to collect line
+      numbers (SF #3024486).</li>
 </ul>
 
 <h3>Non-functional Changes</h3>
 <ul>
-  <li>Reduce memory footprint for coverage data by 30% (Track #106).</li>
-  <li>Move to Eclipse 3.6.x as development environment (Trac #115).</li>
+  <li>Reduced memory footprint for coverage data by 30% (Track #106).</li>
+  <li>Moved to Eclipse 3.6.x as development environment (Trac #115).</li>
+  <li>All delivered bundles and JAR files are signed (Trac #118).</li>
 </ul>
 
 <h3>Fixed Bugs</h3>