diff -ruN emacs-23.1-21.el6.src.rpm-rpmbuild/SOURCES/nostdlib-unwind.patch emacs-23.1-21.el6.0.src.rpm-rpmbuild/SOURCES/nostdlib-unwind.patch
--- emacs-23.1-21.el6.src.rpm-rpmbuild/SOURCES/nostdlib-unwind.patch	1970-01-01 01:00:00.000000000 +0100
+++ emacs-23.1-21.el6.0.src.rpm-rpmbuild/SOURCES/nostdlib-unwind.patch	2011-09-25 16:28:40.000000000 +0100
@@ -0,0 +1,16 @@
+Fix linking problem:
+undefined reference to `__aeabi_unwind_cpp_pr0'
+undefined reference to `__aeabi_unwind_cpp_pr1'
+Index: emacs/src/Makefile.in
+===================================================================
+--- emacs.orig/src/Makefile.in	2008-08-16 14:20:18.000000000 +0000
++++ emacs/src/Makefile.in	2008-08-16 14:51:25.000000000 +0000
+@@ -443,7 +443,7 @@
+    ask GCC explicitly where to find libgcc.a.  */
+ 
+ #ifndef LINKER
+-#define LINKER $(CC) -nostdlib
++#define LINKER $(CC) -nostdlib -lgcc_s
+ #endif
+ 
+ #ifndef LIB_GCC
diff -ruN emacs-23.1-21.el6.src.rpm-rpmbuild/SPECS/emacs.spec emacs-23.1-21.el6.0.src.rpm-rpmbuild/SPECS/emacs.spec
--- emacs-23.1-21.el6.src.rpm-rpmbuild/SPECS/emacs.spec	2011-02-01 15:00:20.000000000 +0000
+++ emacs-23.1-21.el6.0.src.rpm-rpmbuild/SPECS/emacs.spec	2011-09-29 23:58:39.000000000 +0100
@@ -4,7 +4,7 @@
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 21%{?dist}
+Release: 21%{?dist}.0
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -42,6 +42,7 @@
 # Size already changed in upstream
 Patch12: emacs-23.1-defaultfont.patch
 Patch13: emacs-23.1-jis2004.patch
+Patch14: nostdlib-unwind.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
@@ -142,6 +143,7 @@
 %patch11 -p1 -b .spacing
 %patch12 -p1 -b .defaultfont
 %patch13 -p1 -b .jis2004
+%patch14 -p1 -b .nostdlib
 
 # install rest of site-lisp files
 ( cd site-lisp