diff --git a/bugzilla-293109-w3m-el-under-xemacs-cannot-display-utf-8-encoded-web-pages-containing-fffd.patch b/bugzilla-293109-w3m-el-under-xemacs-cannot-display-utf-8-encoded-web-pages-containing-fffd.patch
new file mode 100644
index 0000000..6aa4abc
--- /dev/null
+++ b/bugzilla-293109-w3m-el-under-xemacs-cannot-display-utf-8-encoded-web-pages-containing-fffd.patch
@@ -0,0 +1,47 @@
+diff -ru xemacs-21.5.28.orig/etc/unicode/unicode-consortium/BIG5.TXT xemacs-21.5.28/etc/unicode/unicode-consortium/BIG5.TXT
+--- xemacs-21.5.28.orig/etc/unicode/unicode-consortium/BIG5.TXT	2007-05-07 16:27:16.000000000 +0200
++++ xemacs-21.5.28/etc/unicode/unicode-consortium/BIG5.TXT	2007-07-20 17:24:54.000000000 +0200
+@@ -118,7 +118,7 @@
+ 0xA157	0xFE31	# PRESENTATION FORM FOR VERTICAL EM DASH
+ 0xA158	0x2014	# EM DASH
+ 0xA159	0xFE33	# PRESENTATION FORM FOR VERTICAL LOW LINE
+-0xA15A	0xFFFD	# *** NO MAPPING ***
++#0xA15A	0xFFFD	# *** NO MAPPING ***
+ 0xA15B	0xFE34	# PRESENTATION FORM FOR VERTICAL WAVY LOW LINE
+ 0xA15C	0xFE4F	# WAVY LOW LINE
+ 0xA15D	0xFF08	# FULLWIDTH LEFT PARENTHESIS
+@@ -189,9 +189,9 @@
+ 0xA1C0	0x32A3	# CIRCLED IDEOGRAPH CORRECT
+ 0xA1C1	0x2105	# CARE OF
+ 0xA1C2	0x203E	# OVERLINE
+-0xA1C3	0xFFFD	# *** NO MAPPING ***
++#0xA1C3	0xFFFD	# *** NO MAPPING ***
+ 0xA1C4	0xFF3F	# FULLWIDTH LOW LINE
+-0xA1C5	0xFFFD	# *** NO MAPPING ***
++#0xA1C5	0xFFFD	# *** NO MAPPING ***
+ 0xA1C6	0xFE49	# DASHED OVERLINE
+ 0xA1C7	0xFE4A	# CENTRELINE OVERLINE
+ 0xA1C8	0xFE4D	# DASHED LOW LINE
+@@ -248,8 +248,8 @@
+ 0xA1FB	0x2198	# SOUTH EAST ARROW
+ 0xA1FC	0x2225	# PARALLEL TO
+ 0xA1FD	0x2223	# DIVIDES
+-0xA1FE	0xFFFD	# *** NO MAPPING ***
+-0xA240	0xFFFD	# *** NO MAPPING ***
++#0xA1FE	0xFFFD	# *** NO MAPPING ***
++#0xA240	0xFFFD	# *** NO MAPPING ***
+ 0xA241	0xFF0F	# FULLWIDTH SOLIDUS
+ 0xA242	0xFF3C	# FULLWIDTH REVERSE SOLIDUS
+ 0xA243	0xFF04	# FULLWIDTH DOLLAR SIGN
+@@ -355,9 +355,9 @@
+ 0xA2C9	0x3027	# HANGZHOU NUMERAL SEVEN
+ 0xA2CA	0x3028	# HANGZHOU NUMERAL EIGHT
+ 0xA2CB	0x3029	# HANGZHOU NUMERAL NINE
+-0xA2CC	0xFFFD	# *** NO MAPPING ***
++#0xA2CC	0xFFFD	# *** NO MAPPING ***
+ 0xA2CD	0x5344	# <CJK>
+-0xA2CE	0xFFFD	# *** NO MAPPING ***
++#0xA2CE	0xFFFD	# *** NO MAPPING ***
+ 0xA2CF	0xFF21	# FULLWIDTH LATIN CAPITAL LETTER A
+ 0xA2D0	0xFF22	# FULLWIDTH LATIN CAPITAL LETTER B
+ 0xA2D1	0xFF23	# FULLWIDTH LATIN CAPITAL LETTER C
diff --git a/xemacs.changes b/xemacs.changes
index e3504f8..7ff303f 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 20 19:18:45 CEST 2007 - mfabian@suse.de
+
+- Bugzilla #293109: don't map U+FFFD to Big5 to make it display
+  correctly.
+
 -------------------------------------------------------------------
 Wed Jul 18 19:33:57 CEST 2007 - mfabian@suse.de
 
diff --git a/xemacs.spec b/xemacs.spec
index b4ce80c..571b63c 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:        17
+Release:        18
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the cvs tree of XEmacs:
@@ -80,6 +80,7 @@ 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
+Patch293109:    bugzilla-293109-w3m-el-under-xemacs-cannot-display-utf-8-encoded-web-pages-containing-fffd.patch
 
 %description
 This is the current version of XEmacs, formerly known as Lucid-Emacs.
@@ -166,6 +167,7 @@ Authors:
 %patch38 -p1
 %patch40 -p1
 %patch292811 -p1
+%patch293109 -p1
 %patch0 -p1
 find lisp/ etc/ -name '*.elc' | xargs -r rm -f
 %ifarch ia64
@@ -560,6 +562,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/xemacs/site-packages/lisp/term/
 
 %changelog
+* Fri Jul 20 2007 - mfabian@suse.de
+- Bugzilla #293109: don't map U+FFFD to Big5 to make it display
+  correctly.
 * Wed Jul 18 2007 - mfabian@suse.de
 - Bugzilla #292811: make the function 'x-make-font-bold-italic-xft'
   work.