diff --git a/eclipse-build/ChangeLog b/eclipse-build/ChangeLog
index 927603d..3db4659 100644
--- a/eclipse-build/ChangeLog
+++ b/eclipse-build/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-20  Roland Grunberg  <rgrunber@redhat.com>
+
+	* build.xml: Create proper org.junit_3* and org.junit_4* jar files by
+	merging the system jar classes with the manifest and other content.
+
 2012-01-20  Sami Wagiaalla  <swagiaal@redhat.com>
 
 	* patches/eclipse-dont-link-in-orbit2.patch: New patch.
diff --git a/eclipse-build/build.xml b/eclipse-build/build.xml
index 1a686fc..1a01a09 100644
--- a/eclipse-build/build.xml
+++ b/eclipse-build/build.xml
@@ -389,6 +389,10 @@
 			<regexp pattern="^SHA1-Digest.*" />
 			<substitution expression="" />
 		</replaceregexp>
+		<replaceregexp file="${buildDirectory}/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/META-INF/MANIFEST.MF" flags="m,g,s">
+			<regexp pattern="junit\.jar" />
+			<substitution expression="\." />
+		</replaceregexp>
 		<replaceregexp file="${buildDirectory}/plugins/org.junit_4.8.2.v4_8_2_v20110321-1705/META-INF/MANIFEST.MF" flags="m,g,s">
 			<regexp pattern="^Name.*" />
 			<substitution expression="" />
@@ -397,6 +401,23 @@
 			<regexp pattern="^SHA1-Digest.*" />
 			<substitution expression="" />
 		</replaceregexp>
+		<replaceregexp file="${buildDirectory}/plugins/org.junit_4.8.2.v4_8_2_v20110321-1705/META-INF/MANIFEST.MF" flags="m,g,s">
+			<regexp pattern="junit\.jar" />
+			<substitution expression="\." />
+		</replaceregexp>
+
+		<jar destfile="${buildDirectory}/plugins/org.junit_4.8.2.v4_8_2_v20110321-1705.jar" manifest="${buildDirectory}/plugins/org.junit_4.8.2.v4_8_2_v20110321-1705/META-INF/MANIFEST.MF">
+			<fileset dir="${buildDirectory}/plugins/org.junit_4.8.2.v4_8_2_v20110321-1705/"/>
+			<zipfileset src="/usr/share/java/junit4.jar"/>
+		</jar>
+
+		<jar destfile="${buildDirectory}/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100.jar" manifest="${buildDirectory}/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/META-INF/MANIFEST.MF">
+			<fileset dir="${buildDirectory}/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/"/>
+			<zipfileset src="/usr/share/java/junit4.jar"/>
+		</jar>
+
+		<delete dir="${buildDirectory}/plugins/org.junit_4.8.2.v4_8_2_v20110321-1705/"/>
+		<delete dir="${buildDirectory}/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/"/>
 
 		<!-- Create a stamp file -->
 		<echo file="symlinks-stamp" />
diff --git a/eclipse-build/jdtnonosgidependencies.properties b/eclipse-build/jdtnonosgidependencies.properties
index 1fd8d67..888cb3b 100644
--- a/eclipse-build/jdtnonosgidependencies.properties
+++ b/eclipse-build/jdtnonosgidependencies.properties
@@ -1,3 +1 @@
-org.junit_3.8.2.v3_8_2_v20100427-1100/junit.jar=/usr/share/java/junit4.jar
 org.junit4/junit.jar=/usr/share/java/junit4.jar
-org.junit_4.8.2.v4_8_2_v20110321-1705/junit.jar=/usr/share/java/junit4.jar