diff --git a/.cvsignore b/.cvsignore
index 9ea698d..d5364f5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,3 +8,4 @@ eclipse-R3_5_1-fetched-src.tar.bz2
 eclipse-build-0.4.0RC0.tar.gz
 eclipse-build-0_4_RC3.tar.gz
 eclipse-build-0_4_RC4.tar.gz
+eclipse-build-R0_4_0.tar.gz
diff --git a/eclipse.spec b/eclipse.spec
index 5367bed..1f73bbb 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -27,11 +27,11 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        22%{?dist}
+Release:        23%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        %{download_url}eclipse-build-0_4_RC4.tar.gz
+Source0:        %{download_url}eclipse-build-R0_4_0.tar.gz
 Source1:        %{download_url}eclipse-R3_5_1-fetched-src.tar.bz2
 Source2:        eclipse.sh.in
 Source17:       efj.sh.in
@@ -187,7 +187,7 @@ Eclipse Plugin Development Environment.  This package is required for
 developing Eclipse plugins.
 
 %prep
-%setup -q -n eclipse-build-0_4_RC4
+%setup -q -n eclipse-build-0_4_RC6
 cp %{SOURCE1} .
 ant -DbuildArch=%{eclipse_arch} applyPatches
 pushd build/eclipse-R3_5_1-fetched-src
@@ -556,14 +556,6 @@ popd
 rm -r $sdkDir/configuration/org.eclipse.update
 
 %if %{initialize}
-#Find better way to fix this
-sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090525,plugins/org.eclipse.core.runtime_3.5.0.v20090525.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090525,plugins/org.eclipse.core.runtime_3.5.0.v20090525.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090601,plugins/org.eclipse.equinox.ds_1.1.0.v20090601.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090601,plugins/org.eclipse.equinox.ds_1.1.0.v20090601.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-# dump bundles.info and config.ini to check what's wrong with ppc64 build
-cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
-cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 # FIXME: investigate why it doesn't work to set this -- configuration data is
 # always written to /usr/share/eclipse/configuration, even with
 #     -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
@@ -1104,6 +1096,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Dec 3 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.1-23
+- Remove old manipulations to bundles.info.
+- Update to eclipse-build 0.4 release.
+
 * Mon Nov 30 2009 Andrew Overholt <overholt@redhat.com> 1:3.5.1-22
 - Move ant-nodeps out of bootstrap.
 
diff --git a/sources b/sources
index de72668..6216510 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3ed7a1c9c13a73f6d7abc0b0305631e3  eclipse-R3_5_1-fetched-src.tar.bz2
-99ffc4a33f1e0740f840d4851d28e7b3  eclipse-build-0_4_RC4.tar.gz
+55b14de28d6768f3e429388e37d97a9c  eclipse-R3_5_1-fetched-src.tar.bz2
+8a563a261486607067e00c8eab8f1966  eclipse-build-R0_4_0.tar.gz