diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 91531d009a45c2736e668a4b80a2b6e35409d2d4..f45327e64fced2e65460ca1fd5ef1d93a6659b3f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-12  Kai Tietz  <ktietz@redhat.com>
+
+	* config/i386/i386.md (simple_return): Disable
+	if TARGET_SEH is active.
+
 2011-10-12  Steve Ellcey  <sje@cup.hp.com>
 
 	* config/ia64/ia64.c (ia64_init_builtins): Fix unbalanced parentheses.
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index a11a71b6c2e6b356bf45d21f4a5827a1c358f1ca..b527ad29896475312b995ae77b7d1e6d6e058ea9 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -11708,9 +11708,13 @@
     }
 })
 
+;; We need to disable this for TARGET_SEH, as otherwise
+;; shrink-wrapped prologue gets enabled too.  This might exceed
+;; the maximum size of prologue in unwind information.
+
 (define_expand "simple_return"
   [(simple_return)]
-  ""
+  "!TARGET_SEH"
 {
   if (crtl->args.pops_args)
     {