diff --git a/suse-xft-init.el b/suse-xft-init.el
index 84b2800..0ff1728 100644
--- a/suse-xft-init.el
+++ b/suse-xft-init.el
@@ -82,21 +82,21 @@
 	       (make-face-bold face))
 	   (if (string-match "italic" (symbol-name face))
 	       (make-face-italic face)))
-	 (if (fboundp 'custom-face-get-spec)
-	       (if (and (eq t (plist-get (cadr (assoc t (custom-face-get-spec face))) :bold))
-			(eq t (plist-get (cadr (assoc t (custom-face-get-spec face))) :italic)))
-		   (make-face-bold-italic face))
-	   (if (and (eq 'bold (plist-get (cadr (assoc t (custom-face-get-spec face))) :weight))
-		    (eq 'italic (plist-get (cadr (assoc t (custom-face-get-spec face))) :slant)))
+	 (when (fboundp 'custom-face-get-spec)
+	   (if (and (eq t (plist-get (cadr (assoc t (custom-face-get-spec face))) :bold))
+		    (eq t (plist-get (cadr (assoc t (custom-face-get-spec face))) :italic)))
 	       (make-face-bold-italic face)
-	     (if (eq 'bold (plist-get (cadr (assoc t (custom-face-get-spec face))) :weight))
-		 (make-face-bold face))
-	     (if (eq 'italic (plist-get (cadr (assoc t (custom-face-get-spec face))) :slant))
-		 (make-face-italic face))
-	     (if (eq t (plist-get (cadr (assoc t (custom-face-get-spec face))) :bold))
-		 (make-face-bold face))
-	     (if (eq t (plist-get (cadr (assoc t (custom-face-get-spec face))) :italic))
-		 (make-face-italic face))))
+	     (if (and (eq 'bold (plist-get (cadr (assoc t (custom-face-get-spec face))) :weight))
+		      (eq 'italic (plist-get (cadr (assoc t (custom-face-get-spec face))) :slant)))
+		 (make-face-bold-italic face)
+	       (if (eq 'bold (plist-get (cadr (assoc t (custom-face-get-spec face))) :weight))
+		   (make-face-bold face))
+	       (if (eq 'italic (plist-get (cadr (assoc t (custom-face-get-spec face))) :slant))
+		   (make-face-italic face))
+	       (if (eq t (plist-get (cadr (assoc t (custom-face-get-spec face))) :bold))
+		   (make-face-bold face))
+	       (if (eq t (plist-get (cadr (assoc t (custom-face-get-spec face))) :italic))
+		   (make-face-italic face)))))
 	 ))
      (face-list))))
 
diff --git a/xemacs.changes b/xemacs.changes
index 5a42068..343e05b 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 02 19:39:36 CET 2008 - mfabian@suse.de
+
+- Bugzilla #350554: fix a serious bug in the last change.
+
 -------------------------------------------------------------------
 Fri Dec 21 19:41:57 CET 2007 - mfabian@suse.de
 
diff --git a/xemacs.spec b/xemacs.spec
index d814476..98fbf45 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xemacs (Version 21.5.28.20071220)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -37,7 +37,7 @@ Requires:       xemacs-info xemacs-packages ctags
 Conflicts:      gnuserv
 AutoReqProv:    on
 Version:        21.5.28.20071220
-Release:        2
+Release:        7
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the cvs tree of XEmacs:
@@ -577,6 +577,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/xemacs/site-packages/lisp/term/
 
 %changelog
+* Wed Jan 02 2008 - mfabian@suse.de
+- Bugzilla #350554: fix a serious bug in the last change.
 * Fri Dec 21 2007 - mfabian@suse.de
 - some more hacks in the Xft font setup.
 * Fri Dec 21 2007 - mfabian@suse.de