diff --git a/.gitignore b/.gitignore
index bb4973b..76e8155 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ eclipse-build-0.5.0.tar.bz2
 eclipse-3.6.0-src.tar.bz2
 eclipse-build-0.6.1RC0.tar.bz2
 eclipse-build-0_6_1_RC2.tar.bz2
+eclipse-build-0.6.1.tar.bz2
diff --git a/eclipse.spec b/eclipse.spec
index 8e32d06..cd2473d 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -8,7 +8,7 @@ Epoch:  1
 %global eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %global eclipse_micro   0
 %global initialize      1
-%global download_url    http://www.eclipse.org/downloads/download.php?file=/technology/linuxtools/eclipse-build/3.6.x_Helios/
+%global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/3.6.x_Helios/
 %global bootstrap 0
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -27,11 +27,11 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        %{download_url}eclipse-build-0_6_1_RC2.tar.bz2
+Source0:        %{download_url}eclipse-build-0.6.1.tar.bz2
 Source1:        %{download_url}eclipse-3.6.0-src.tar.bz2
 Source2:        eclipse.sh.in
 Source17:       efj.sh.in
@@ -176,11 +176,13 @@ Eclipse Plugin Development Environment.  This package is required for
 developing Eclipse plugins.
 
 %prep
-%setup -q -n eclipse-build-0_6_1_RC2
+%setup -q -n eclipse-build-0.6.1
 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
 
+
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
 sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
@@ -579,6 +581,10 @@ fi
 %{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* 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.
+
 * Tue Aug 17 2010 Andrew Overholt <overholt@redhat.com> 1:3.6.0-6
 - Update to eclipse-build 0.6.1RC2.
 - List a few files that were missing but should be installed.
diff --git a/sources b/sources
index c1eb429..7aeb167 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 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