diff --git a/missing_font_paths.diff b/missing_font_paths.diff
index e293aec..ec02b3f 100644
--- a/missing_font_paths.diff
+++ b/missing_font_paths.diff
@@ -1,17 +1,19 @@
 --- configure.ac
 +++ configure.ac
-@@ -505,11 +505,13 @@
+@@ -505,11 +505,15 @@
  XORG_FONTSUBDIR(FONTTYPE1DIR, fonttype1dir, Type1)
  XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi)
  XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi)
 +XORG_FONTSUBDIR(FONTURWDIR, fonturwdir, URW)
 +XORG_FONTSUBDIR(FONTCYRILLICDIR, fontcyrillicdir, cyrillic)
++XORG_FONTSUBDIR(FONTSGIDIR, fontsgidir, misc/sgi)
++XORG_FONTSUBDIR(FONTTRUETYPEDIR, fonttruetypedir, truetype)
  
  dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
  dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
  dnl compiling, assume default font path uses standard FONTROOTDIR directories.
 -DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
-+DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/,${FONTURWDIR}/,${FONTCYRILLICDIR}/"
++DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}:unscaled,${FONT75DPIDIR}:unscaled,${FONTURWDIR}/,${FONTCYRILLICDIR}:unscaled,${FONTSGIDIR}:unscaled,${FONTTRUETYPEDIR}/"
  if test "$cross_compiling" != yes; then
  	AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
  		[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 8407a5a..510ba84 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jun 28 18:09:36 CEST 2010 - sndirsch@suse.de
+
+- missing_font_paths.diff:
+  * added /usr/share/fonts/{misc/sgi,truetype} to core font
+    rendering default path; always use ":unscaled" for bitmap
+    font paths (bnc #616400)
+
 -------------------------------------------------------------------
 Sat May 29 01:04:47 CEST 2010 - sndirsch@suse.de