diff --git a/eclipse.spec b/eclipse.spec
index cd2473d..19c2603 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:        7%{?dist}
+Release:        8%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -37,6 +37,7 @@ Source2:        eclipse.sh.in
 Source17:       efj.sh.in
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
+Patch0:         remove-ant-trax.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant ant-nodeps
@@ -64,11 +65,11 @@ BuildRequires:  icu4j-eclipse >= 1:4.2.1-1
 BuildRequires:  tomcat5-jasper-eclipse >= 5.5.27-6.3
 BuildRequires:  tomcat6-servlet-2.5-api >= 6.0.18-9.2
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
-BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-trax ant-jsch
+BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch
 BuildRequires: jsch >= 0:0.1.41
-BuildRequires: jakarta-commons-el >= 1.0-9
-BuildRequires: jakarta-commons-logging >= 1.0.4-6jpp.3
-BuildRequires: jakarta-commons-codec
+BuildRequires: apache-commons-el >= 1.0-9
+BuildRequires: apache-commons-logging >= 1.0.4-6jpp.3
+BuildRequires: apache-commons-codec
 BuildRequires: jakarta-commons-httpclient
 BuildRequires: jetty >= 6.1.24-1
 BuildRequires: lucene >= 2.3.1-3.4
@@ -119,10 +120,10 @@ Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:   %{name}-rcp = %{epoch}:%{version}-%{release}
 %if ! %{bootstrap}
 Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
-Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
-Requires: jakarta-commons-el >= 1.0-9
-Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
-Requires: jakarta-commons-codec
+Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-jsch
+Requires: apache-commons-el >= 1.0-9
+Requires: apache-commons-logging >= 1.0.4-6jpp.3
+Requires: apache-commons-codec
 Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
 Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
 Requires: jetty >= 6.1.24-1
@@ -181,7 +182,7 @@ cp %{SOURCE1} .
 ant -DbuildArch=%{eclipse_arch} applyPatches
 sed -i -e "s|org.apache.ant_1.7.1.v20100518-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar:/usr/share/java/ant-trax.jar||g" nonosgidependencies.properties
 pushd build/eclipse-%{version}-src
-
+%patch0
 
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
@@ -581,6 +582,10 @@ fi
 %{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Sep 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1:3.6.0-8
+- Add patch to remove ant-trax from ant bundle's classpath.
+- Use new package names in BR/R.
+
 * Wed Sep 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1:3.6.0-7
 - Update to eclipse-build 0.6.1 release.
 - Fix build with ant 1.8.1.
diff --git a/remove-ant-trax.patch b/remove-ant-trax.patch
new file mode 100644
index 0000000..3850ad0
--- /dev/null
+++ b/remove-ant-trax.patch
@@ -0,0 +1,11 @@
+--- plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF.sav	2010-09-01 13:18:07.340148088 +0300
++++ plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF	2010-09-01 13:18:30.639388918 +0300
+@@ -6,7 +6,7 @@ Bundle-ClassPath: lib/ant.jar,lib/ant-an
+  mail.jar,lib/ant-jdepend.jar,lib/ant-jmf.jar,lib/ant-jsch.jar,lib/ant
+  -junit.jar,lib/ant-launcher.jar,lib/ant-netrexx.jar,lib/ant-nodeps.ja
+  r,lib/ant-starteam.jar,lib/ant-stylebook.jar,lib/ant-swing.jar,lib/an
+- t-trax.jar,lib/ant-weblogic.jar
++ t-weblogic.jar
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+ Bundle-RequiredExecutionEnvironment: J2SE-1.2
diff --git a/sources b/sources
index 7aeb167..460959d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 dd89873f9c7c9fb1413cb1c13312799b  eclipse-3.6.0-src.tar.bz2
-0fcecc859fcc519f1468a0591d179a76  eclipse-build-0_6_1_RC2.tar.bz2
 dac006a81d45f366ecbf3f78f7fa9424  eclipse-build-0.6.1.tar.bz2