diff --git a/mc-X11.patch b/mc-X11.patch
new file mode 100644
index 0000000..697a25b
--- /dev/null
+++ b/mc-X11.patch
@@ -0,0 +1,14 @@
+--- src/x11conn.c
++++ src/x11conn.c
+@@ -135,6 +135,11 @@
+     x11_module = g_module_open (x11_module_fname, G_MODULE_BIND_LAZY);
+     g_free (x11_module_fname);
+ 
++    /* loading libX11 via g_module seems to be a bad idea,
++       this hack fixes it at least for openSUSE */
++    if (x11_module == NULL)
++	x11_module = g_module_open ("libX11.so.6", G_MODULE_BIND_LAZY);
++
+     if (x11_module == NULL)
+ 	return FALSE;
+ 
diff --git a/mc.changes b/mc.changes
index f1e3821..87a8f10 100644
--- a/mc.changes
+++ b/mc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct  9 11:57:28 CEST 2008 - nadvornik@suse.cz
+
+- fixed dynamic loading of X11 library
+  [http://savannah.gnu.org/bugs/index.php?24505]
+
 -------------------------------------------------------------------
 Tue Sep  9 18:05:39 CEST 2008 - nadvornik@suse.cz
 
diff --git a/mc.spec b/mc.spec
index 4c71d51..fc5e883 100644
--- a/mc.spec
+++ b/mc.spec
@@ -26,7 +26,7 @@ Group:          Productivity/File utilities
 PreReq:         permissions
 AutoReqProv:    on
 Version:        4.6.2.pre1
-Release:        116
+Release:        120
 Summary:        Midnight Commander
 Source:         mc-4.6.2-pre1.tar.bz2
 Source1:        x11_browser
@@ -71,6 +71,8 @@ Patch38:        99b_fix-regex-pattern-lengths.patch
 Patch39:        99c_fix-regex-newline-match.patch
 Patch40:        99_regexp-replace-fixed.patch
 Patch41:        100_fix_bashisms.patch
+#
+Patch42:        mc-X11.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://www.ibiblio.org/mc/
 Requires:       %{name}-lang = %{version}
@@ -173,6 +175,7 @@ Authors:
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
+%patch42
 
 %build
 pushd po
@@ -268,6 +271,9 @@ rm -rf %{buildroot}
 %files lang -f %{name}.lang
 
 %changelog
+* Thu Oct 09 2008 nadvornik@suse.cz
+- fixed dynamic loading of X11 library
+  [http://savannah.gnu.org/bugs/index.php?24505]
 * Tue Sep 09 2008 nadvornik@suse.cz
 - added bugfixes from upstream cvs and from debian package for
   * preserve Attributes checkbox [bnc#419832]