diff --git a/eclipse.spec b/eclipse.spec
index c67cca3..25a74e3 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -54,6 +54,7 @@ Patch1:		%{name}-textsearch.patch
 # http://people.redhat.com/bkonrath/eclipse/buildable-source-zips.html
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
 Patch2:		%{name}-build.patch
+Patch3:	        %{name}-swt-libgcjawt.patch
 Patch4:		%{name}-libupdatebuild.patch
 Patch5:		%{name}-libupdatebuild2.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
@@ -107,7 +108,7 @@ BuildRequires:  mozilla-nspr-devel >= 37:1.7.8
 BuildRequires:  xorg-x11-devel
 %if %{gcj_support}
 BuildRequires:	gcc-java >= 4.0.0-2
-BuildRequires:	java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_18rh
+BuildRequires:	java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_24rh
 BuildRequires:  dos2unix
 %else
 BuildRequires:	java-devel >= 1.4.2
@@ -138,7 +139,7 @@ Obsoletes:	ecj
 Provides:	ecj
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.0-2
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
+Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -155,9 +156,9 @@ Provides:	%{name}-sdk = %{epoch}:%{version}-%{release}
 Provides:       %{name}-ui = %{epoch}:%{version}-%{release}
 Provides:       %{name}-gtk2 = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
-Requires:	java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
+Requires:	java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
 Requires:	libgcj >= 4.0.0-2
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
+Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -194,7 +195,7 @@ Requires:       %{name}-ecj = %{epoch}:%{version}-%{release}
 Requires:	junit >= 3.8.1-3jpp
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.0-2
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
+Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
 %endif
 
 %description    jdt
@@ -214,7 +215,7 @@ Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
 Requires:       %{name}-platform-devel = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
+Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
 Requires:	libgcj >= 4.0.0-2
 %endif
 
@@ -236,7 +237,7 @@ Eclipse PDE.
 Summary:        SWT Library for GTK2
 Group:          Text Editors/Integrated Development Environments (IDE)
 %if %{gcj_support}
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
+Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
 Requires:	libgcj >= 4.0.0-2
 %endif
 
@@ -251,6 +252,7 @@ pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 %patch0 -p0
 %patch11 -p0
 %if %{gcj_support}
+%patch3 -p0
 %patch14 -p0
 %endif
 popd
@@ -1062,6 +1064,8 @@ fi
 * Fri May 20 2005 Ben Konrath <bkonrath@redhat.com> 3.1.0_fc-0.M6.21
 - Add ecj-options patch to bootstrap source.
 - Make embedded browser widget work (Robin Green).
+- Bump required version of java-gcj-compat to the latest (-40jpp_24rh).
+- Add patch to make swt use libgcjawt instead of libjawt for gcj.
 
 * Thu May 19 2005 Ben Konrath <bkonrath@redhat.com> 3.1.0_fc-0.M6.20
 - Add ecj-options patch.