diff --git a/eclipse-junit-dropins.patch b/eclipse-junit-dropins.patch
new file mode 100644
index 0000000..6241217
--- /dev/null
+++ b/eclipse-junit-dropins.patch
@@ -0,0 +1,24 @@
+--- plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
++++ plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
+@@ -90,6 +90,21 @@ class P2Utils {
+ 		try {
+ 			URL bundlesTxt= new URL(bundlesLocationURL.getProtocol(), bundlesLocationURL.getHost(), new File(bundlesLocationURL.getFile(), bundleInfoPath).getAbsolutePath());
+ 			BundleInfo bundles[]= getBundlesFromFile(bundlesLocationURL, bundlesTxt);
++			if (useConfigArea) {
++				// the config area may have relative URLs that should be
++				// resolved to the install location.
++				URL installLocationURL = Platform.getInstallLocation().getURL();
++				BundleInfo installBundles[]= getBundlesFromFile(installLocationURL, bundlesTxt);
++				if (bundles == null || bundles.length == 0) {
++					bundles = installBundles;
++				}
++				else if (installBundles != null && installBundles.length > 0) {
++					BundleInfo mergedBundles[] = new BundleInfo[bundles.length + installBundles.length];
++					System.arraycopy(bundles, 0, mergedBundles, 0, bundles.length);
++					System.arraycopy(installBundles, 0, mergedBundles, bundles.length, installBundles.length);
++					bundles = mergedBundles;
++				}
++			}
+ 			if (bundles == null || bundles.length == 0) {
+ 				return null;
+ 			}
diff --git a/eclipse.spec b/eclipse.spec
index f9e4422..421e339 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        24%{?dist}
+Release:        25%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -47,6 +47,7 @@ Source28:       %{name}-mv-Platform.sh
 Patch0:        %{name}-target-platform-template.patch
 # make o.e.swt.gtk.linux.ppc64 version to match ppc 
 Patch1:        %{name}-swt-ppc64-version.patch
+Patch2:        %{name}-junit-dropins.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant ant-nodeps
@@ -387,6 +388,7 @@ fi
 %patch0 -p0
 # make o.e.swt.gtk.linux.ppc64 version to match ppc 
 %patch1
+%patch2
 popd
 
 %build
@@ -1095,6 +1097,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Dec 15 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.1-25
+- Fix o.e.jdt.junit dropins issue. RHBZ#538803 (Thanks to Patrick Higgins).
+
 * Fri Dec 4 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.1-24
 - Replace gecko BR/Rs with xulrunner.
 - Drop xulrunner-devel-unstable now that it's merged in xulrunner-devel.