diff --git a/emacs.changes b/emacs.changes
index 164e3ca..b217c68 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 27 16:19:58 CEST 2010 - werner@suse.de
+
+- Avoid segfault with newer gcc 4.5.0, see Emacs bug #6031 on
+  debbugs.gnu.org
+
 -------------------------------------------------------------------
 Mon Apr  5 18:32:53 CEST 2010 - ro@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 8f9a4c4..56755c9 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -25,7 +25,7 @@ Url:            http://www.gnu.org/software/emacs/
 License:        GPLv2+
 Group:          Productivity/Editors/Emacs
 Version:        23.1
-Release:        12
+Release:        13
 Obsoletes:      ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc
 Requires:       emacs-info = %{version}
 Requires:       emacs_program = %{version}-%{release}
@@ -307,6 +307,7 @@ LDFLAGS=
   cflags -Wno-unused-variable    CFLAGS
   cflags -Wno-unused-label       CFLAGS
   cflags -Wno-unprototyped-calls CFLAGS
+  cflags -fno-optimize-sibling-calls CFLAGS
   cflags -Wl,-O2		 LDFLAGS
   cflags -Wl,--hash-size=65521	 LDFLAGS
 %ifarch ia64