+# Install /usr/bin/ecj script
+sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE20} > ecj
+install -m755 ecj $RPM_BUILD_ROOT%{_bindir}
+
 %if %{gcj_support}
 aot-compile-rpm
-
-# Build and install ecj binary
-pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
-  gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
-    -Wl,-R,%{_libdir}/gcj/%{name} org.eclipse.jdt.core_3.1.0.jar.so \
-    -o $RPM_BUILD_ROOT%{_bindir}/ecj
-popd
-chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj
 %endif