diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0ded56ee2e95..beb705e8a58b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct  7 14:40:43 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* c-pragma.c (insert_pack_attributes): Do not insert
+	attributes unless #pragma pack(push,<n>) is in effect.
+
 Wed Oct  7 12:10:46 1998  Jim Wilson  <wilson@cygnus.com>
 
 	* expr.c (emit_group_store): Handle a PARALLEL destination.
diff --git a/gcc/c-pragma.c b/gcc/c-pragma.c
index 90edeb744a11..a28679e6e06e 100644
--- a/gcc/c-pragma.c
+++ b/gcc/c-pragma.c
@@ -146,7 +146,8 @@ insert_pack_attributes (node, attributes, prefix)
   tree a;
 
   /* If we are not packing, then there is nothing to do.  */
-  if (maximum_field_alignment == 0)
+  if (maximum_field_alignment == 0
+      || alignment_stack == NULL)
     return;
 
   /* We are only interested in fields.  */