diff --git a/gparted-fix-thread-linking.patch b/gparted-fix-thread-linking.patch
new file mode 100644
index 0000000..5724a5b
--- /dev/null
+++ b/gparted-fix-thread-linking.patch
@@ -0,0 +1,44 @@
+commit e1df6dbb31c5a1f6f8cda97503cf77cf1be3e33c
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Fri Jan 6 15:23:43 2012 +0100
+
+    build: Correctly link to gthread
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=667412
+
+diff --git a/configure.in b/configure.in
+index b44584a..774192a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -180,6 +180,11 @@ int main ()
+ LIBS="$LIBS_save"
+ 
+ 
++dnl gthread
++PKG_CHECK_MODULES([GTHREAD], [gthread-2.0])
++AC_SUBST([GTHREAD_LIBS])
++AC_SUBST([GTHREAD_CFLAGS])
++
+ dnl GTKMM
+ PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 > 2.8])
+ AC_SUBST([GTKMM_LIBS])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f3f5cf6..d3b0b5d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,5 @@
+ INCLUDES =						\
++	$(GTHREAD_CFLAGS) 				\
+ 	$(GTKMM_CFLAGS) 				\
+ 	-DGPARTED_DATADIR=\""$(datadir)"\"			\
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+@@ -64,7 +65,7 @@ gpartedbin_SOURCES = \
+ 	ufs.cc				\
+ 	xfs.cc
+ 
+-gpartedbin_LDFLAGS = -lparted -lgthread-2.0 
++gpartedbin_LDFLAGS = -lparted
+ 
+-gpartedbin_LDADD = $(GTKMM_LIBS)
++gpartedbin_LDADD = $(GTHREAD_LIBS) $(GTKMM_LIBS)
+ 
diff --git a/gparted.changes b/gparted.changes
index 5b66934..ae2427b 100644
--- a/gparted.changes
+++ b/gparted.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan  6 14:16:50 UTC 2012 - vuntz@opensuse.org
+
+- Add gparted-fix-thread-linking.patch: fix build system to
+  correctly link to gthread.
+- Add automake and libtool BuildRequires, as well as call to
+  autoreconf, for above patch.
+
 -------------------------------------------------------------------
 Tue Jan  3 08:43:08 UTC 2012 - vuntz@opensuse.org
 
diff --git a/gparted.spec b/gparted.spec
index a418b4c..c494363 100644
--- a/gparted.spec
+++ b/gparted.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           gparted
 Version:        0.11.0
 Release:        0
@@ -23,6 +24,10 @@ License:        GPL-2.0
 Group:          System/Filesystems
 Url:            http://gparted.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/project/gparted/gparted/gparted-0.11.0/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM gparted-fix-thread-linking.patch vuntz@opensuse.org -- Fix build system to correctly link to thread libraries
+Patch0:         gparted-fix-thread-linking.patch
+# needed for patch0
+BuildRequires:  automake
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -32,6 +37,8 @@ BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gtkmm2-devel
 BuildRequires:  intltool
 BuildRequires:  libglademm-devel
+# needed for patch0
+BuildRequires:  libtool
 BuildRequires:  parted-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  scrollkeeper
@@ -60,8 +67,11 @@ copying data residing on hard disks and mirroring one partition with another
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+# needed for patch0
+autoreconf -fi
 export GKSUPROG="/usr/bin/xdg-su -c"
 %configure \
 	--disable-scrollkeeper