diff --git a/xemacs-21.5.34-gcc5.patch b/xemacs-21.5.34-gcc5.patch
index ba7cb28..9c16e1c 100644
--- a/xemacs-21.5.34-gcc5.patch
+++ b/xemacs-21.5.34-gcc5.patch
@@ -2,14 +2,24 @@
  src/lisp.h |    2 ++
  1 file changed, 2 insertions(+)
 
---- src/lisp.h
-+++ src/lisp.h	2015-06-19 15:07:05.294018565 +0000
+Index: src/lisp.h
+===================================================================
+--- src/lisp.h.orig
++++ src/lisp.h
 @@ -1154,6 +1154,8 @@ typedef int Boolint;
  
  /* ------------------------ alignment definitions ------------------- */
  
-+#undef lisp_max_align_t
-+#define max_align_t lisp_max_align_t
++#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \
++    (!defined (__cplusplus) || __cplusplus < 201103L)
  /* No type has a greater alignment requirement than max_align_t.
     (except perhaps for types we don't use, like long double) */
  typedef union
+@@ -1163,6 +1165,7 @@ typedef union
+   struct { void (*f)(void); } f;
+   struct { double d; } d;
+ } max_align_t;
++#endif
+ 
+ /* ALIGNOF returns the required alignment of a type -- i.e. a value such
+    that data of this type must begin at a memory address which is a
diff --git a/xemacs.changes b/xemacs.changes
index a93facc..8a8d30f 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 23 17:18:48 UTC 2015 - schwab@suse.de
+
+- xemacs-21.5.34-gcc5.patch: Define max_align_t only for C < 11
+
 -------------------------------------------------------------------
 Fri Jun 19 15:16:09 UTC 2015 - werner@suse.de
 
diff --git a/xemacs.spec b/xemacs.spec
index 89bd87c..f30b5bd 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xemacs
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed