diff --git a/xfce4-session-fix-libgmodule-underlinking.patch b/xfce4-session-fix-libgmodule-underlinking.patch
new file mode 100644
index 0000000..833054b
--- /dev/null
+++ b/xfce4-session-fix-libgmodule-underlinking.patch
@@ -0,0 +1,54 @@
+Index: xfce4-session-4.8.2/configure.in
+===================================================================
+--- xfce4-session-4.8.2.orig/configure.in
++++ xfce4-session-4.8.2/configure.in
+@@ -82,6 +82,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.
+ XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.22])
+ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
+ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.73])
++XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [])
+ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
+ 
+ dnl we provide a panel plugin now
+Index: xfce4-session-4.8.2/settings/Makefile.am
+===================================================================
+--- xfce4-session-4.8.2.orig/settings/Makefile.am
++++ xfce4-session-4.8.2/settings/Makefile.am
+@@ -25,6 +25,7 @@ xfce4_session_settings_CFLAGS = \
+ 	-DMODULESDIR=\"$(libdir)/xfce4/session/splash-engines\" \
+ 	-DG_LOG_DOMAIN=\"xfce4-session-settings\" \
+ 	-I$(top_srcdir) \
++	$(GMODULE_CFLAGS) \
+ 	$(LIBXFCE4UTIL_CFLAGS) \
+ 	$(LIBXFCE4UI_CFLAGS) \
+ 	$(XFCONF_CFLAGS) \
+@@ -32,7 +33,8 @@ xfce4_session_settings_CFLAGS = \
+ 
+ xfce4_session_settings_LDADD = \
+ 	$(top_builddir)/libxfsm/libxfsm-4.6.la \
+-	$(LIBXFCE4UTIL_CFLAGS) \
++	$(GMODULE_LIBS) \
++	$(LIBXFCE4UTIL_LIBS) \
+ 	$(LIBXFCE4UI_LIBS) \
+ 	$(XFCONF_LIBS) \
+ 	$(DBUS_GLIB_LIBS)
+Index: xfce4-session-4.8.2/xfce4-session/Makefile.am
+===================================================================
+--- xfce4-session-4.8.2.orig/xfce4-session/Makefile.am
++++ xfce4-session-4.8.2/xfce4-session/Makefile.am
+@@ -51,6 +51,7 @@ xfce4_session_SOURCES =							\
+ 	xfsm-startup.h
+ 
+ xfce4_session_CFLAGS =							\
++	$(GMODULE_CFLAGS)						\
+ 	$(GNOME_CFLAGS)							\
+ 	$(GNOME_KEYRING_CFLAGS)						\
+ 	$(LIBSM_CFLAGS)							\
+@@ -69,6 +70,7 @@ xfce4_session_CFLAGS =							\
+ 
+ xfce4_session_LDADD =							\
+ 	$(top_builddir)/libxfsm/libxfsm-4.6.la				\
++	$(GMODULE_LIBS)							\
+ 	$(LIBSM_LDFLAGS)						\
+ 	$(LIBSM_LIBS)							\
+ 	$(LIBX11_LDFLAGS)						\
diff --git a/xfce4-session.changes b/xfce4-session.changes
index 6a193c1..6f69381 100644
--- a/xfce4-session.changes
+++ b/xfce4-session.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 13 17:04:56 UTC 2012 - gber@opensuse.org
+
+- added xfce4-session-fix-libgmodule-underlinking.patch in order to
+  explicitly link against libgmodule
+
 -------------------------------------------------------------------
 Thu Dec 15 15:58:02 UTC 2011 - gber@opensuse.org
 
diff --git a/xfce4-session.spec b/xfce4-session.spec
index 56945e4..39865a7 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xfce4-session
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,12 +30,15 @@ Patch0:         xfce4-session-simple-splash-remove-shadows.patch
 Patch1:         xfce4-session-fix-gnome-mode.patch
 # PATCH-FEATURE-UPSTREAM xfce4-session-lock-screen-on-suspend-hibernate.patch bxo#6019 gber@opensuse.org -- Try to lock the screen when hibernating/suspending
 Patch2:         xfce4-session-lock-screen-on-suspend-hibernate.patch
+# PATCH-FEATURE-UPSTREAM xfce4-session-fix-libgmodule-underlinking.patch bxo#8340 gber@opensuse.org -- Link explicitly against libgmodule
+Patch3:         xfce4-session-fix-libgmodule-underlinking.patch
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook_4
 BuildRequires:  intltool
 BuildRequires:  libxslt
 BuildRequires:  perl-XML-Parser
 BuildRequires:  update-desktop-files
+BuildRequires:  xfce4-dev-tools
 BuildRequires:  xml2po
 BuildRequires:  xorg-x11
 BuildRequires:  pkgconfig(dbus-glib-1)
@@ -91,8 +94,10 @@ This package provides the upstream look and feel for the Xfce Session Manager.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
+xdt-autogen
 %configure \
     --docdir=%{_datadir}/xfce4/xfce4-session \
     --disable-static \