diff --git a/ChangeLog b/ChangeLog
index d0d164dd9..3c6689ee5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-12  Christian Hoff  <christian_hoff@gmx.net>
+
+	* configure.in.in: Detect GDK backend.
+	* */*.dll.config.in: Link against the libs of the correct GDK backend
+	instead of using x11 on Linux/win32 on Windows.
+	Patch by Christian Hergert.	[Fixes 527840]
+
 2009-08-07  Mike Kestner  <mkestner@novell.com>
 
 	* configure.in.in: add new dir and autofu for it.
diff --git a/configure.in.in b/configure.in.in
index 52b51edf8..7594651b4 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -202,6 +202,9 @@ if test "x$enable_glade_sharp" != "xno"; then
 	AC_SUBST(GLADE_LIBS)
 fi
 
+GDK_BACKEND=`pkg-config --variable=target gtk+-2.0`
+AC_SUBST(GDK_BACKEND)
+
 AC_PATH_PROG(MDOC, mdoc, no)
 if test "x$MDOC" = "xno"; then
   enable_monodoc=no
diff --git a/gdk/gdk-sharp.dll.config.in b/gdk/gdk-sharp.dll.config.in
index 0924374e0..f29a0a300 100644
--- a/gdk/gdk-sharp.dll.config.in
+++ b/gdk/gdk-sharp.dll.config.in
@@ -1,6 +1,6 @@
 <configuration>
   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-@GDK_BACKEND@-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
   <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 </configuration>
diff --git a/gtk/gtk-sharp.dll.config.in b/gtk/gtk-sharp.dll.config.in
index ec9d3b93d..e540dbe7c 100644
--- a/gtk/gtk-sharp.dll.config.in
+++ b/gtk/gtk-sharp.dll.config.in
@@ -2,5 +2,5 @@
   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
   <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-@GDK_BACKEND@-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 </configuration>
diff --git a/gtkdotnet/gtk-dotnet.dll.config.in b/gtkdotnet/gtk-dotnet.dll.config.in
index 75550978e..8f2e60d91 100644
--- a/gtkdotnet/gtk-dotnet.dll.config.in
+++ b/gtkdotnet/gtk-dotnet.dll.config.in
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-@GDK_BACKEND@-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 </configuration>