diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e1f5ad81a89..8d2b667792a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-23  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config/i386/i386.c (override_options): Set upper limit of
+	-mpreferred-stack-boundary to 12.
+
 2001-10-22  Zack Weinberg  <zack@codesourcery.com>
 
 	* recog.c (peephole2_optimize): Add default case to switch.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 691a3979fea..5183c5f5e11 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -978,8 +978,8 @@ override_options ()
   if (ix86_preferred_stack_boundary_string)
     {
       i = atoi (ix86_preferred_stack_boundary_string);
-      if (i < (TARGET_64BIT ? 3 : 2) || i > 31)
-	error ("-mpreferred-stack-boundary=%d is not between %d and 31", i,
+      if (i < (TARGET_64BIT ? 3 : 2) || i > 12)
+	error ("-mpreferred-stack-boundary=%d is not between %d and 12", i,
 	       TARGET_64BIT ? 3 : 2);
       else
 	ix86_preferred_stack_boundary = (1 << i) * BITS_PER_UNIT;