diff --git a/bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch b/bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch
new file mode 100644
index 0000000..79a1142
--- /dev/null
+++ b/bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch
@@ -0,0 +1,21 @@
+diff -ru xemacs-21.5.28.orig/lisp/x-faces.el xemacs-21.5.28/lisp/x-faces.el
+--- xemacs-21.5.28.orig/lisp/x-faces.el	2007-05-07 16:27:44.000000000 +0200
++++ xemacs-21.5.28/lisp/x-faces.el	2007-07-18 19:25:10.000000000 +0200
+@@ -198,7 +198,7 @@
+ 				(fc-name-parse font))))
+     (if pattern
+ 	(let ((size (fc-pattern-get-size pattern 0))
+-	      (copy (fc-copy-pattern-partial pattern (list "family"))))
++	      (copy (fc-copy-pattern-partial pattern (list "family" "slant"))))
+ 	  (fc-pattern-del-weight copy)
+ 	  (fc-pattern-del-style copy)
+ 	  (when copy
+@@ -272,7 +272,7 @@
+ 				(fc-name-parse font))))
+     (if pattern
+       (let ((size (fc-pattern-get-size pattern 0))
+-	    (copy (fc-copy-pattern-partial pattern (list "family"))))
++	    (copy (fc-copy-pattern-partial pattern (list "family" "weight"))))
+ 	(when copy
+ 	  (fc-pattern-del-slant copy)
+ 	  (fc-pattern-del-style copy)
diff --git a/fix-load-history.el b/fix-load-history.el
index f834771..4d8b596 100644
--- a/fix-load-history.el
+++ b/fix-load-history.el
@@ -11,7 +11,7 @@
 ;;; Test whether this works by evaluating (find-function 'next-line)
 ;;; 
 
-(defvar build-directory
+(defvar suse-build-directory
   (let ((dumped-file (symbol-file 'next-line)))
     (and lisp-directory
 	 (file-directory-p lisp-directory)
@@ -21,9 +21,9 @@
          (substring dumped-file (match-beginning 1) (match-end 1))))
   "The directory that is stored in load-history for dumped files")
 
-(when build-directory
+(when suse-build-directory
   (eval-after-load 'find-func
     (dolist (entry load-history)
-      (when (string-match (regexp-quote build-directory) (car entry))
+      (when (string-match (regexp-quote suse-build-directory) (car entry))
 	(setcar entry (replace-match lisp-directory t t (car entry)))))))
 
diff --git a/xemacs.changes b/xemacs.changes
index d48fce6..e3504f8 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Jul 18 19:33:57 CEST 2007 - mfabian@suse.de
+
+- Bugzilla #292811: make the function 'x-make-font-bold-italic-xft'
+  work.
+
+-------------------------------------------------------------------
+Wed Jul 18 16:39:12 CEST 2007 - mfabian@suse.de
+
+- fix the hack in fix-load-history.el to fix the load history
+  which made it possible to use find-function on functions which
+  are in dumped lisp files, even if XEmacs was not dumped at the
+  place where it is finally running. This hack stopped working
+  because the variable 'build-history' now exists already
+  and therefore the 'defvar' in fix-load-history failed to set
+  its value. Renamed the variable to suse-build-directory.
+
 -------------------------------------------------------------------
 Mon Jul 16 15:03:47 CEST 2007 - mfabian@suse.de
 
diff --git a/xemacs.spec b/xemacs.spec
index 07c6bdf..b4ce80c 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -37,7 +37,7 @@ Requires:       xemacs-info xemacs-packages ctags
 Conflicts:      gnuserv
 Autoreqprov:    on
 Version:        21.5.28
-Release:        15
+Release:        17
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the cvs tree of XEmacs:
@@ -79,6 +79,7 @@ Patch33:        set-locale-to-c-when-not-supported-by-x.patch
 Patch34:        suppress-warning-about-undefined-unicode-key-mappings.patch
 Patch38:        unitialized-variables.patch
 Patch40:        cast-pointer-integer-different-size.patch
+Patch292811:    bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch
 
 %description
 This is the current version of XEmacs, formerly known as Lucid-Emacs.
@@ -164,6 +165,7 @@ Authors:
 #%patch34 -p1
 %patch38 -p1
 %patch40 -p1
+%patch292811 -p1
 %patch0 -p1
 find lisp/ etc/ -name '*.elc' | xargs -r rm -f
 %ifarch ia64
@@ -558,6 +560,17 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/xemacs/site-packages/lisp/term/
 
 %changelog
+* Wed Jul 18 2007 - mfabian@suse.de
+- Bugzilla #292811: make the function 'x-make-font-bold-italic-xft'
+  work.
+* Wed Jul 18 2007 - mfabian@suse.de
+- fix the hack in fix-load-history.el to fix the load history
+  which made it possible to use find-function on functions which
+  are in dumped lisp files, even if XEmacs was not dumped at the
+  place where it is finally running. This hack stopped working
+  because the variable 'build-history' now exists already
+  and therefore the 'defvar' in fix-load-history failed to set
+  its value. Renamed the variable to suse-build-directory.
 * Mon Jul 16 2007 - mfabian@suse.de
 - enable Xft only for openSUSE >= 10.2.
 * Fri Jul 13 2007 - mfabian@suse.de