diff --git a/site-start.el b/site-start.el
index 9aa781b..c4611d7 100644
--- a/site-start.el
+++ b/site-start.el
@@ -285,15 +285,12 @@
       ;; coding-system for XIM, it is just autodetected which
       ;; will work correctly only when the coding-system priorities
       ;; are OK.)
-      (if (not (string-match "utf-8" tmp))
+      (if (coding-system-category (intern tmp))
+	  ;; if coding-system-category is nil the coding-system is
+	  ;; no-conversion or undecided and prefer-coding system would
+	  ;; fail.
 	  (progn (prefer-coding-system (intern tmp))
-		 (if (fboundp 'latin-unity-install) (latin-unity-install)))
-	;; it's strange, but (prefer-coding-system 'utf-8) doesn't
-	;; work in XEmacs.
-	;; use 'set-coding-priority-list instead, which achieves
-	;; the same and works for 'utf-8 as well:
-	(set-coding-priority-list (list (intern tmp)))
-	(set-coding-category-system (intern tmp) (intern tmp)))
+		 (if (fboundp 'latin-unity-install) (latin-unity-install))))
       (if (emacs-version>= 21 5 6)
 	  ;; XEmacs 21.5 apparently renamed this function:
 	  (set-default-output-coding-systems (intern tmp))
diff --git a/xemacs.changes b/xemacs.changes
index c31f320..76010c0 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Aug 20 14:09:28 CEST 2008 - mfabian@suse.de
+
+- bnc#418055: check coding-system-category before trying to use
+  pefer-coding-system, if coding-system-category is nil the
+  coding-system is no-conversion or undecided and prefer-coding
+  system would fail.
+
 -------------------------------------------------------------------
 Mon Jun 30 14:24:03 CEST 2008 - schwab@suse.de
 
diff --git a/xemacs.spec b/xemacs.spec
index 3130649..b47900e 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -2,9 +2,16 @@
 # spec file for package xemacs (Version 21.5.28.20080401)
 #
 # 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.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -37,7 +44,7 @@ Requires:       xemacs-info xemacs-packages ctags
 Conflicts:      gnuserv
 AutoReqProv:    on
 Version:        21.5.28.20080401
-Release:        19
+Release:        43
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the cvs tree of XEmacs:
@@ -592,6 +599,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/xemacs/site-packages/lisp/term/
 
 %changelog
+* Wed Aug 20 2008 mfabian@suse.de
+- bnc#418055: check coding-system-category before trying to use
+  pefer-coding-system, if coding-system-category is nil the
+  coding-system is no-conversion or undecided and prefer-coding
+  system would fail.
 * Mon Jun 30 2008 schwab@suse.de
 - Fix broken use of autoconf internal macros.
 * Mon Apr 28 2008 mfabian@suse.de