diff --git a/libXfont-commit-0f9db4a.diff b/libXfont-commit-0f9db4a.diff
new file mode 100644
index 0000000..cc2318b
--- /dev/null
+++ b/libXfont-commit-0f9db4a.diff
@@ -0,0 +1,20 @@
+commit 1ab07ce0eec4f6c7ed66c7aba3edf8c4315dd907
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue May 13 17:26:57 2008 -0700
+
+    FontFileDirectoryChanged: check length of "fonts.alias" as well as "fonts.dir"
+
+diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
+index a13798a..1489938 100755
+--- a/src/fontfile/dirfile.c
++++ b/src/fontfile/dirfile.c
+@@ -176,6 +176,9 @@ FontFileDirectoryChanged(FontDirectoryPtr dir)
+     }
+     if (dir->dir_mtime != statb.st_mtime)
+ 	return TRUE;
++
++    if ((strlen(dir->directory) + sizeof(FontAliasFile)) > sizeof(dir_file))
++	return FALSE;
+     strcpy (dir_file, dir->directory);
+     strcat (dir_file, FontAliasFile);
+     if (stat (dir_file, &statb) == -1)
diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes
index c5e6000..9fefab3 100644
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 14 12:16:06 CEST 2008 - sndirsch@suse.de
+
+- libXfont-commit-0f9db4a.diff
+  * fixes 2 byte buffer overflow (bnc #390065)
+
 -------------------------------------------------------------------
 Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de
 
diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec
index 6a7f017..57d2908 100644
--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@@ -20,7 +20,7 @@ Provides:       libXaw.so.8 libXaw.so.7 libXaw.so.6
 %endif
 Url:            http://xorg.freedesktop.org/
 Version:        7.3
-Release:        50
+Release:        58
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/Libraries
@@ -65,6 +65,7 @@ Patch3:         p_xft_cjk.diff
 Patch4:         p_xft_register.diff
 Patch5:         libxkbui.diff
 Patch10:        libXxf86misc-xcb.diff
+Patch11:        libXfont-commit-0f9db4a.diff
 
 %description
 This package contains the remaining X.Org libraries.
@@ -150,6 +151,9 @@ popd
 pushd libXxf86misc-*
 %patch10 -p0
 popd
+pushd libXfont-*
+%patch11 -p1
+popd
 
 %build
 for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
@@ -222,6 +226,9 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog
+* Wed May 14 2008 sndirsch@suse.de
+- libXfont-commit-0f9db4a.diff
+  * fixes 2 byte buffer overflow (bnc #390065)
 * Thu Apr 10 2008 ro@suse.de
 - added baselibs.conf file to build xxbit packages
   for multilib support