diff --git a/deep_sequencing_unit/build/build.xml b/deep_sequencing_unit/build/build.xml
index fdb640583a103cbfd45e99c224c47b08c50a5e0f..a512e05bb25b124e9d888863b73c4c01d844362b 100644
--- a/deep_sequencing_unit/build/build.xml
+++ b/deep_sequencing_unit/build/build.xml
@@ -66,10 +66,31 @@
 	  <delete dir="${dist.tracking}" />
 	</target>
 
+	<target name="jar" depends="compile">
+		<mkdir dir="${dist}" />
+		<build-info revision="revision.number" version="version.number" clean="clean.flag" />
+		<echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
+		<jar destfile="${plugin-jar.file}">
+			<fileset dir="${classes}">
+				<include name="ch/ethz/bsse/cisd/dsu/**/*.class" />
+				<include name="ch/systemsx/cisd.openbis/dss/BuildAndEnvironmentInfo.class" />
+				<include name="${build.info.filename}" />
+			</fileset>
+			<fileset dir="source">
+				<include name="**/*.sql" />
+			</fileset>	
+			<manifest>
+				<attribute name="Version" value="${version.number}" />
+				<attribute name="Build-Number"
+				           value="${version.number} (r${revision.number},${clean.flag})" />
+			</manifest>
+		</jar>
+	</target>
+	
 	<!--
         // Task for creating distributions
         -->
-	<target name="dist" depends="datastore_server.make-dist, tracking-dist" />
+	<target name="dist" depends="jar, datastore_server.make-plugin-dist, tracking-dist" />
 
 	<!--
         // Task for continuous integration server.
diff --git a/plasmid/build/build.xml b/plasmid/build/build.xml
index e77a66a9ab2da2c71c023b4bfd8159a32602a92e..479fc7dd540ef246600c044155d61320f0742e39 100644
--- a/plasmid/build/build.xml
+++ b/plasmid/build/build.xml
@@ -4,7 +4,7 @@
 
 	<property name="original.dist" value="dist" />
 	<property name="mainfolder" value="plasmid" />
-	<property name="variant" value="-plasmid" />
+	<property name="variant" value="plasmid" />
 
 	<target name="compile" depends="build-common.compile, clean" />
 
@@ -17,18 +17,29 @@
 	<!--
         // Task for creating distributions
   -->
-	<target name="dist" depends="datastore_server.make-dist" />
+	<target name="dist" depends="jar, datastore_server.make-plugin-dist" />
 
 	<!--
         // Task for continuous integration server.
   -->
 	<target name="ci" depends="build-common.ci, dist, check-dependencies" />
 
-	<target name="dss-jar" depends="datastore_server.dss-jar">
-		<jar update="true" destfile="${dss-jar.file}">
+	<target name="jar" depends="compile">
+		<build-info revision="revision.number" version="version.number" clean="clean.flag" />
+		<echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
+		<jar destfile="${plugin-jar.file}">
+			<fileset dir="${classes}">
+				<include name="eu/**/*.class" />
+				<include name="${build.info.filename}" />
+			</fileset>
 			<fileset dir="source">
 				<include name="**/*.sql" />
-			</fileset>
+			</fileset>	
+			<manifest>
+				<attribute name="Version" value="${version.number}" />
+				<attribute name="Build-Number"
+				           value="${version.number} (r${revision.number},${clean.flag})" />
+			</manifest>
 		</jar>
 	</target>