diff --git a/eclipse.spec b/eclipse.spec
index e4d360a..245c4a0 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -22,7 +22,7 @@ ExclusiveArch: i386 x86_64 ppc
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:	0.M5.18
+Release:	0.M5.19
 License:        CPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -108,6 +108,7 @@ BuildRequires: jsch
 BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-logging jakarta-commons-modeler mx4j
 #BuildRequires: servlet lucene-demo jasper4 tomcat4
 BuildRequires: regexp junit
+Requires(post,postun): java-1.4.2-gcj-compat
 
 %description
 The Eclipse Platform is designed for building integrated development
@@ -481,14 +482,19 @@ rm -f plugins/org.junit_3.8.1/junit.jar
 rm \
   .%{_libdir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}/eclipseAdaptor.jar.so
 
+pushd .%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0
+  gcj -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
+    -Wl,-R,%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0 \
+    jdtcore.jar.so jdtCompilerAdapter.jar.so -o ecj
+popd
+
 # Tar up the native libs
-tar czvf ../%{name}-nativelycompiledjars.tar.gz .%{_libdir}/%{name}
+tar czf ../%{name}-nativelycompiledjars.tar.gz .%{_libdir}/%{name}
 
 popd
 
 # Remove expanded eclipse build
 rm -rf eclipse
-ls
 popd
 
 %install
@@ -508,6 +514,11 @@ tar -C $RPM_BUILD_ROOT -zxf result/%{name}-nativelycompiledjars.tar.gz
 
 install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
 
+# Install ecj binary
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0/ecj \
+  $RPM_BUILD_ROOT%{_bindir}
+chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj
+
 # Directory to hold all the .jar->.so mapping dbs
 install -d -m 755 $RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`
 install -d -m 755 $RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
@@ -798,6 +809,7 @@ rebuild-gcj-db %{_libdir}
 %{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-ecj.db
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0/jdtcore.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0/jdtCompilerAdapter.jar.so
+%attr(0755,root,root) %{_bindir}/ecj
 
 %files -n %{libname}-gtk2 -f %{libname}-gtk2.install
 %defattr(0644,root,root,0755)
@@ -992,6 +1004,11 @@ rebuild-gcj-db %{_libdir}
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Tue Apr 12 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.19
+- Add Requires(post,postun): java-1.4.2-gcj-compat for rebuild-gcj-db (Joe
+  Orton).
+- Add ecj binary.
+
 * Wed Apr 06 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.18
 - Fix typo in gcj db building loops.
 - Add -O1 to x86_64 jar.so compilation.