diff --git a/xemacs-configure.patch b/xemacs-configure.patch
new file mode 100644
index 0000000..b78a804
--- /dev/null
+++ b/xemacs-configure.patch
@@ -0,0 +1,10 @@
+--- configure.ac
++++ configure.ac
+@@ -387,6 +387,7 @@ dnl ------------------------------------
+ dnl
+ dnl Internal macro to recursively expand all the options in the option list.
+ dnl
++m4_define([m4_fst], [$1])
+ define([XE_EXPAND_COMPLEX_OPTIONS],
+ [m4_if([$2], [], [],
+        [XE_EXPAND_COMPLEX_OPTION([$1], m4_fst($2))[]dnl
diff --git a/xemacs.changes b/xemacs.changes
index 79f9fde..c31f320 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 30 14:24:03 CEST 2008 - schwab@suse.de
+
+- Fix broken use of autoconf internal macros.
+
 -------------------------------------------------------------------
 Mon Apr 28 14:27:29 CEST 2008 - mfabian@suse.de
 
diff --git a/xemacs.spec b/xemacs.spec
index d698993..3130649 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.20080401
-Release:        7
+Release:        19
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the cvs tree of XEmacs:
@@ -93,6 +93,7 @@ Patch43:        set-language-unicode-precedence-list.patch
 Patch45:        fix-defface-custom-modified-face.patch
 Patch47:        xaw3d-config.patch
 Patch48:        fix-window-configuration-problem.patch
+Patch49:        xemacs-configure.patch
 Patch292811:    bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch
 Patch301352:    bugzilla-301352-fix-wrong-incrementing-in-macros.patch
 
@@ -186,6 +187,7 @@ Authors:
 %patch45 -p0
 %patch47
 %patch48 -p1
+%patch49
 %patch292811 -p1
 %patch301352 -p1
 %patch0 -p1
@@ -590,6 +592,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/xemacs/site-packages/lisp/term/
 
 %changelog
+* Mon Jun 30 2008 schwab@suse.de
+- Fix broken use of autoconf internal macros.
 * Mon Apr 28 2008 mfabian@suse.de
 - add fix-window-configuration-problem.patch
   (see http://article.gmane.org/gmane.emacs.xemacs.beta/27797)