diff --git a/eclipse.spec b/eclipse.spec
index e6bbe9c..8af4b5c 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -183,6 +183,10 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  java-javadoc
 BuildRequires:  libXt-devel
+# For ecj's AOT bits
+BuildRequires:  gcc-java
+BuildRequires:  java-1.5.0-gcj-javadoc
+BuildRequires:  java-gcj-compat-devel
 
 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-nodeps ant-swing ant-trax ant-jsch
@@ -211,6 +215,10 @@ Group:          Development/Languages
 Obsoletes:      ecj < %{version}-%{release}
 Provides:       ecj = %{version}-%{release}
 Requires:       java >= 1.6.0
+# For AOT bits
+Requires:       libgcj >= 4.0.2
+Requires(post):     java-gcj-compat >= 1.0.64
+Requires(postun):   java-gcj-compat >= 1.0.64
 
 %description    ecj
 Eclipse compiler for Java.
@@ -1272,9 +1280,23 @@ ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar \
 
 popd
 
+unset RPM_PACKAGE_NAME
+aot-compile -c "$RPM_OPT_FLAGS" $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/plugins \
+  $RPM_BUILD_ROOT%{_libdir}/gcj/eclipse-ecj
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post ecj
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
+  %{_bindir}/rebuild-gcj-db
+fi
+
+%postun ecj
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
+  %{_bindir}/rebuild-gcj-db
+fi
+
 %post platform
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -1298,6 +1320,7 @@ fi
 %{_javadir}/jdtcore*.jar
 %{_javadir}/ecj*.jar
 %{_bindir}/ecj
+%{_libdir}/gcj/eclipse-ecj
 
 %if %{initialize}
 %files swt -f %{name}-swt.install
@@ -1545,6 +1568,7 @@ fi
 * Mon Dec 15 2008 Andrew Overholt <overholt@redhat.com> 1:3.4.1-12
 - Update pdebuild and package-build patch to include -z option.
 - Make ecj default to 1.5 (rh#354721).
+- Add GCJ AOT bits for ecj (rh#473674).
 
 * Fri Dec 5 2008 Andrew Overholt <overholt@redhat.com> 1:3.4.1-10
 - Remove MaxPermSize from sysproperty lists in library.xml as it was causing the