diff --git a/skel.init.el b/skel.init.el
index 1055217..7545675 100644
--- a/skel.init.el
+++ b/skel.init.el
@@ -2,16 +2,16 @@
 ;;; File name: ` ~/.xemacs/init.el '
 ;;; ---------------------
 ;;;
-;;; Copyright (c) 2002 SuSE Gmbh Nuernberg, Germany. 
+;;; Copyright (c) 2002,2015 SuSE Gmbh Nuernberg, Germany. 
 ;;;
-;;; Author: Werner Fink, <feedback@suse.de> 2002
+;;; Author: Werner Fink, <feedback@suse.de> 2002,2015
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;;
 ;; Load custom file
 ;; ----------------
 (setq custom-file "~/.xemacs/custom.el")
-(load "~/.xemacs/custom.el" t t)
+(load-options-file custom-file)
 
 ;;
 ;; More coding systems (UNICODE)
diff --git a/xemacs-21.5.34-custom-fonts.patch b/xemacs-21.5.34-custom-fonts.patch
new file mode 100644
index 0000000..dd2a9f6
--- /dev/null
+++ b/xemacs-21.5.34-custom-fonts.patch
@@ -0,0 +1,38 @@
+---
+ lisp/cus-face.el |    6 +++++-
+ lisp/startup.el  |    2 +-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+--- lisp/cus-face.el
++++ lisp/cus-face.el	2015-07-10 10:52:20.177518702 +0000
+@@ -42,6 +42,9 @@
+ (eval-when-compile
+   (require 'font))
+ 
++;; Simply to apply any custom faces
++(autoload 'initialize-custom-faces "faces")
++
+ ;;; Declaring a face.
+ 
+ ;;;###autoload
+@@ -336,7 +339,8 @@ and non-nil, FACE will also be created a
+ COMMENT is a string comment about FACE.
+ 
+ See `defface' for the format of SPEC."
+-  (apply #'custom-theme-set-faces 'user args))
++  (apply #'custom-theme-set-faces 'user args)
++  (initialize-custom-faces))
+ 
+ ;;;###autoload
+ (defun custom-theme-set-faces (theme &rest args)
+--- lisp/startup.el
++++ lisp/startup.el	2015-07-13 11:14:12.609518333 +0000
+@@ -1101,7 +1101,7 @@ exact problem."
+ Currently this does nothing but call `load', but it might be redefined
+ in the future to support automatically converting older options files to
+ a new format, when variables have changed, etc."
+-  (load filename))
++  (load filename t))
+ 
+ (defun command-line-1 ()
+   (cond
diff --git a/xemacs.changes b/xemacs.changes
index 8a8d30f..827d3f4 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jul 13 11:16:32 UTC 2015 - werner@suse.de
+
+- Avoid error on not existing custom.el 
+
+-------------------------------------------------------------------
+Fri Jul 10 11:23:15 UTC 2015 - werner@suse.de
+
+- Add patch xemacs-21.5.34-custom-fonts.patch to be able to apply
+  any custom font/face change at startup (bsc#932321)
+
 -------------------------------------------------------------------
 Tue Jun 23 17:18:48 UTC 2015 - schwab@suse.de
 
diff --git a/xemacs.spec b/xemacs.spec
index f30b5bd..b88e28d 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -89,8 +89,10 @@ Patch54:        xemacs-21.5.34-gcc5.patch
 Patch56:        xemacs-libpng15.patch
 Patch292811:    bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch
 Patch301352:    bugzilla-301352-fix-wrong-incrementing-in-macros.patch
-# PATCH-FIC-UPSTREAM bsc#930170
+# PATCH-FIX-UPSTREAM bsc#930170
 Patch57:        xemacs-21.5.34-Xaw3D_I18N.patch
+# PATCH-FIX-SUSE bsc#932321
+Patch58:        xemacs-21.5.34-custom-fonts.patch
 Requires(pre):  permissions
 Requires:       ctags
 Requires:       efont-unicode
@@ -181,6 +183,7 @@ echo Use xfs, that is XFontSet support for internationalized menubar.
 %patch292811 -p1
 %patch301352 -p1
 %patch57 -p0
+%patch58 -p0
 %patch0 -p1
 find lisp/ etc/ -name '*.elc' | xargs -r rm -f
 find . -name CVS -type d | xargs rm -rf