diff --git a/eclipse.sh.in b/eclipse.sh.in
new file mode 100755
index 0000000..6eae604
--- /dev/null
+++ b/eclipse.sh.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Work around bugs.eclipse.org/290395
+export GDK_NATIVE_WINDOWS=true
+
+/usr/lib/eclipse/eclipse "$@"
\ No newline at end of file
diff --git a/eclipse.spec b/eclipse.spec
index ff771c1..33f1a8f 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -27,12 +27,13 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        12%{?dist}
+Release:        13%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0:        %{download_url}eclipse-build-0.4.0RC0.tar.gz
 Source1:        %{download_url}eclipse-R3_5_1-fetched-src.tar.bz2
+Source2:        eclipse.sh.in
 Source17:       efj.sh.in
 # This file contains the types of files we'd like to extract from the jars
 # when using the FileInitializer
@@ -395,6 +396,13 @@ SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 
 ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -DbuildArch=%{eclipse_arch} -Dmultilib=true install
 
+# Set GDK_NATIVE_WINDOWS=true
+# https://bugzilla.redhat.com/531675 (https://bugs.eclipse.org/290395)
+rm $RPM_BUILD_ROOT/%{_bindir}/%{name}
+install -p -D -m0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
+sed --in-place "s:/usr/lib:%{_libdir}:" \
+  $RPM_BUILD_ROOT%{_bindir}/%{name}
+  
 cp $RPM_BUILD_ROOT%{_libdir}/eclipse/eclipse.ini eclipse.ini-real
 # Some directories we need
 sdkDir=$RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -1078,6 +1086,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Oct 30 2009 Andrew Overholt <overholt@redhat.com> 1:3.5.1-13
+- Make /usr/bin/eclipse a wrapper script due to rhbz#531675 (e.o#290395).
+
 * Mon Oct 26 2009 Andrew Overholt <overholt@redhat.com> 1:3.5.1-12
 - Remove old TODO items.