diff --git a/bugzilla-244613-cut-paste-64bit-non-ascii.patch b/bugzilla-244613-cut-paste-64bit-non-ascii.patch
deleted file mode 100644
index a65e066..0000000
--- a/bugzilla-244613-cut-paste-64bit-non-ascii.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- xemacs-21.5.27.20060705.orig/src/select-x.c	2007-02-16 12:42:44.000000000 +0100
-+++ xemacs-21.5.27.20060705/src/select-x.c	2007-02-16 16:09:32.000000000 +0100
-@@ -1048,7 +1048,10 @@
-       return;
-     }
- 
--  total_size = bytes_remaining + 1;
-+  if (sizeof(long) == 8 && *actual_format_ret == 32)
-+    total_size = 2 * bytes_remaining + 1;
-+  else
-+    total_size = bytes_remaining + 1;
-   *data_ret = xnew_rawbytes (total_size);
- 
-   /* Now read, until we've gotten it all. */
---- xemacs/src/select-x.c-dist	2007-02-15 01:49:41.000000000 +0100
-+++ xemacs/src/select-x.c	2007-02-15 03:09:54.000000000 +0100
-@@ -1072,7 +1074,13 @@ x_get_window_property (Display *display,
- 	 reading it.  Deal with that, I guess....
-        */
-       if (result != Success) break;
--      *actual_size_ret *= *actual_format_ret / 8;
-+      /* What a mess, XGetWindowProperty() returns "long" array on LP64
-+	 even if format == 32...
-+       */
-+      if (sizeof(long) == 8 && *actual_format_ret == 32)
-+	*actual_size_ret *= 8;
-+      else
-+	*actual_size_ret *= *actual_format_ret / 8;
-       memcpy ((*data_ret) + offset, tmp_data, *actual_size_ret);
-       offset += *actual_size_ret;
-       XFree ((char *) tmp_data);
diff --git a/xemacs-21.5.27.20060705.tar.bz2 b/xemacs-21.5.27.20060705.tar.bz2
deleted file mode 100644
index 7372229..0000000
--- a/xemacs-21.5.27.20060705.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:471ff31062cf08961f5750dc1bf3d9029cd15bb2d07ec27e2faf38436e838043
-size 9823249
diff --git a/xemacs-21.5.27.20070507.tar.bz2 b/xemacs-21.5.27.20070507.tar.bz2
new file mode 100644
index 0000000..cf40866
--- /dev/null
+++ b/xemacs-21.5.27.20070507.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a644839a044b413f2149ec970b7a10e685f3addcdb4fdf926d0a0b2669c86650
+size 10066987
diff --git a/xemacs-autoconf.patch b/xemacs-autoconf.patch
deleted file mode 100644
index 431a067..0000000
--- a/xemacs-autoconf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -22,8 +22,6 @@
- dnl Due to a dependence on the implementation of certain internal autoconf
- dnl macros, die if any version other than 2.59 is used.
- AC_PREREQ(2.59)dnl
--m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.59]), 1,
--	[m4_fatal([This script can only be generated with autoconf 2.59])], [])dnl
- AC_INIT([XEmacs],[21.5],[xemacs-beta@xemacs.org])dnl
- AC_CONFIG_SRCDIR(src/lisp.h)dnl
- dnl
-@@ -382,6 +380,7 @@
- dnl
- define([XE_EXPAND_COMPLEX_OPTIONS],
- [m4_if([$2], [[]], [],
-+       [$2], [], [],
-        [XE_EXPAND_COMPLEX_OPTION([$1], m4_fst($2))[]dnl
- XE_EXPAND_COMPLEX_OPTIONS([$1], m4_cdr($2))])])dnl
- dnl
diff --git a/xemacs.changes b/xemacs.changes
index 7766607..600852f 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon May 07 16:34:41 CEST 2007 - mfabian@suse.de
+
+- update to 21.5.27.20070507. From the CHANGES-beta file:
+  • Get X11 window property correctly on 64-bit platforms
+    (bugzilla #244613) -- Stephen J. Turnbull, Mike Fabian,
+    Takashi Iwai
+  • Test for ISO-2022 decoder not choking on invalid UTF-8
+    -- Aidan Kehoe
+  • Get Unicode tables with permissive license
+    -- Stephen J. Turnbull, Mike Fabian (see bug #212630)
+- remove xemacs-autoconf.patch (included upstream).
+- remove bugzilla-244613-cut-paste-64bit-non-ascii.patch
+  (included upstream).
+
 -------------------------------------------------------------------
 Mon Mar 26 15:31:22 CEST 2007 - rguenther@suse.de
 
diff --git a/xemacs.patch b/xemacs.patch
index de5203e..4896812 100644
--- a/xemacs.patch
+++ b/xemacs.patch
@@ -116,7 +116,7 @@ diff -Nru xemacs-21.5.20.orig/lib-src/mmencode.c xemacs-21.5.20/lib-src/mmencode
 diff -Nru xemacs-21.5.20.orig/lib-src/pop.c xemacs-21.5.20/lib-src/pop.c
 --- xemacs-21.5.20.orig/lib-src/pop.c	2004-09-20 21:19:11.000000000 +0200
 +++ xemacs-21.5.20/lib-src/pop.c	2005-05-12 14:38:20.000000000 +0200
-@@ -124,16 +124,20 @@
+@@ -129,16 +129,20 @@
  #define POP_PORT 110
  #define KPOP_PORT 1109
  #if defined(WIN32_NATIVE) || defined(CYGWIN)
@@ -132,12 +132,12 @@ diff -Nru xemacs-21.5.20.orig/lib-src/pop.c xemacs-21.5.20/lib-src/pop.c
  #endif
  #ifdef KERBEROS
 -#ifdef KRB5
--#define KPOP_SERVICE "k5pop";
+-#define KPOP_SERVICE "k5pop"
 -#else
 -#define KPOP_SERVICE "kpop"
 -#endif
 +#  ifdef KRB5
-+#    define KPOP_SERVICE "k5pop";
++#    define KPOP_SERVICE "k5pop"
 +#  else
 +#    define KPOP_SERVICE "kpop"
 +#  endif
diff --git a/xemacs.spec b/xemacs.spec
index 44e8e3e..dffad20 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package xemacs (Version 21.5.27.20060705)
+# spec file for package xemacs (Version 21.5.27.20070507)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -30,8 +30,8 @@ Obsoletes:      xe_exec
 Prereq:         permissions
 Requires:       xemacs-info xemacs-packages ctags
 Autoreqprov:    on
-Version:        21.5.27.20060705
-Release:        44
+Version:        21.5.27.20070507
+Release:        1
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the cvs tree of XEmacs:
@@ -47,11 +47,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #     cd ..
 # Now make a tar.bz2 file from the contents of the "packages" directory:
 #      tar jcvf xemacs-<version>.tar.bz2 xemacs-<version>/
-Source0:        ftp://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.27.20060705.tar.bz2
+Source0:        ftp://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.27.20070507.tar.bz2
 Source1:        xe-list.el
 Source2:        fix-load-history.el
 Patch0:         xemacs.patch
-Patch1:         xemacs-autoconf.patch
 # keep in sync with the similar patch to the app-defaults in the main xemacs-packages package:
 Patch3:         xemacs-21.4.8-app-defaults.patch
 Patch5:         xemacs-21.4.4-font-menu.patch
@@ -71,7 +70,6 @@ Patch33:        set-locale-to-c-when-not-supported-by-x.patch
 Patch34:        suppress-warning-about-undefined-unicode-key-mappings.patch
 Patch38:        unitialized-variables.patch
 Patch40:        cast-pointer-integer-different-size.patch
-Patch41:        bugzilla-244613-cut-paste-64bit-non-ascii.patch
 
 %description
 This is the current version of XEmacs, formerly known as Lucid-Emacs.
@@ -137,7 +135,6 @@ Authors:
 
 %prep
 %setup -q -n xemacs-%{version}
-%patch1 -p0 -b .conf
 %patch3 -p0 -b .appdef
 #%patch5 -p1 -b .fontmenu # appears to be not needed anymore
 %patch13 -p1 -b .ia64
@@ -158,7 +155,6 @@ Authors:
 #%patch34 -p1
 %patch38 -p1
 %patch40 -p1
-%patch41 -p1
 %patch0 -p1
 find lisp/ etc/ -name '*.elc' | xargs -r rm -f
 %ifarch ia64
@@ -556,6 +552,18 @@ mv $RPM_BUILD_ROOT/usr/share/applications/xemacs.desktop.new $RPM_BUILD_ROOT/usr
 %dir /usr/share/xemacs/site-packages/lisp/term/
 
 %changelog
+* Mon May 07 2007 - mfabian@suse.de
+- update to 21.5.27.20070507. From the CHANGES-beta file:
+  • Get X11 window property correctly on 64-bit platforms
+  (bugzilla #244613) -- Stephen J. Turnbull, Mike Fabian,
+  Takashi Iwai
+  • Test for ISO-2022 decoder not choking on invalid UTF-8
+    -- Aidan Kehoe
+  • Get Unicode tables with permissive license
+    -- Stephen J. Turnbull, Mike Fabian (see bug #212630)
+- remove xemacs-autoconf.patch (included upstream).
+- remove bugzilla-244613-cut-paste-64bit-non-ascii.patch
+  (included upstream).
 * Mon Mar 26 2007 - rguenther@suse.de
 - Add gdbm-devel, gpm and ncurses-devel BuildRequires.
 * Wed Feb 14 2007 - mfabian@suse.de