diff --git a/byte-comp-problem.patch b/byte-comp-problem.patch
new file mode 100644
index 0000000..f384fdd
--- /dev/null
+++ b/byte-comp-problem.patch
@@ -0,0 +1,14 @@
+diff -ru xemacs-21.5.28.20080107.orig/lisp/bytecomp.el xemacs-21.5.28.20080107/lisp/bytecomp.el
+--- xemacs-21.5.28.20080107.orig/lisp/bytecomp.el	2007-12-04 21:35:31.000000000 +0100
++++ xemacs-21.5.28.20080107/lisp/bytecomp.el	2008-01-14 17:05:42.000000000 +0100
+@@ -1888,7 +1888,8 @@
+ 	  (print-readably t)	; print #[] for bytecode, 'x for (quote x)
+ 	  (print-gensym (if (and byte-compile-print-gensym
+ 				 (not byte-compile-emacs19-compatibility))
+-			    '(t) nil)))
++			    '(t) nil))
++	  print-gensym-alist)
+       (princ "\n" byte-compile-outbuffer)
+       (prin1 form byte-compile-outbuffer)
+       nil)))
+xemacs-21.5.28.20080107/lispだけに発見: bytecomp.el~
diff --git a/xemacs-21.5.28.20071220.tar.bz2 b/xemacs-21.5.28.20071220.tar.bz2
deleted file mode 100644
index 84ecf2e..0000000
--- a/xemacs-21.5.28.20071220.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc72b166a7f136efea944dc0720c029bf42fe850b7ca67fb8ee81580f4cfd786
-size 10023222
diff --git a/xemacs-21.5.28.20080107.tar.bz2 b/xemacs-21.5.28.20080107.tar.bz2
new file mode 100644
index 0000000..ff83f6e
--- /dev/null
+++ b/xemacs-21.5.28.20080107.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fecd857142e69dcf1fe83463d65e6537ff2636038d3cea08a1f2048b7f595a57
+size 10194924
diff --git a/xemacs.changes b/xemacs.changes
index 343e05b..d81912d 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jan 14 16:51:40 CET 2008 - mfabian@suse.de
+
+- update to 21.5.28.20080107.
+- add byte-comp-problem.patch by Aidan Kehoe from
+  http://hg.debian.org/hg/xemacs/xemacs?cs=e8f448f997ac 
+  to fix bugzilla #352331.
+
 -------------------------------------------------------------------
 Wed Jan 02 19:39:36 CET 2008 - mfabian@suse.de
 
diff --git a/xemacs.spec b/xemacs.spec
index 98fbf45..3631ead 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package xemacs (Version 21.5.28.20071220)
+# spec file for package xemacs (Version 21.5.28.20080107)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -36,8 +36,8 @@ PreReq:         permissions
 Requires:       xemacs-info xemacs-packages ctags
 Conflicts:      gnuserv
 AutoReqProv:    on
-Version:        21.5.28.20071220
-Release:        7
+Version:        21.5.28.20080107
+Release:        1
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the cvs tree of XEmacs:
@@ -84,6 +84,7 @@ Patch41:        bugzilla-294746-set-language-unicode-precedence-list-at-startup.
 Patch42:        build-fix-ccl-load-problem.patch
 Patch43:        set-language-unicode-precedence-list.patch
 Patch45:        fix-defface-custom-modified-face.patch
+Patch46:        byte-comp-problem.patch
 Patch292811:    bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch
 Patch301352:    bugzilla-301352-fix-wrong-incrementing-in-macros.patch
 
@@ -173,6 +174,7 @@ Authors:
 #%patch42 -p1
 %patch43 -p1
 %patch45 -p0
+%patch46 -p1
 %patch292811 -p1
 %patch301352 -p1
 %patch0 -p1
@@ -577,6 +579,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/xemacs/site-packages/lisp/term/
 
 %changelog
+* Mon Jan 14 2008 - mfabian@suse.de
+- update to 21.5.28.20080107.
+- add byte-comp-problem.patch by Aidan Kehoe from
+  http://hg.debian.org/hg/xemacs/xemacs?cs=e8f448f997ac
+  to fix bugzilla #352331.
 * Wed Jan 02 2008 - mfabian@suse.de
 - Bugzilla #350554: fix a serious bug in the last change.
 * Fri Dec 21 2007 - mfabian@suse.de