diff --git a/tccgen.c b/tccgen.c
index 202ed07..bbe1d83 100644
--- a/tccgen.c
+++ b/tccgen.c
@@ -3179,10 +3179,8 @@ static void struct_decl(CType *type, AttributeDef *ad, int u)
 
     a = tok; /* save decl type */
     next();
-    if (tok == TOK_ATTRIBUTE1 || tok == TOK_ATTRIBUTE2) {
+    if (tok == TOK_ATTRIBUTE1 || tok == TOK_ATTRIBUTE2)
         parse_attribute(ad);
-        next();
-    } 
     if (tok != '{') {
         v = tok;
         next();
@@ -3302,7 +3300,7 @@ static void struct_decl(CType *type, AttributeDef *ad, int u)
                     if (ad1.a.aligned) {
                         if (align < ad1.a.aligned)
                             align = ad1.a.aligned;
-                    } else if (ad1.a.packed) {
+                    } else if (ad1.a.packed || ad->a.packed) {
                         align = 1;
                     } else if (*tcc_state->pack_stack_ptr) {
                         if (align > *tcc_state->pack_stack_ptr)
diff --git a/tests/tcctest.c b/tests/tcctest.c
index a6878db..57226f7 100644
--- a/tests/tcctest.c
+++ b/tests/tcctest.c
@@ -108,6 +108,7 @@ void cmp_comparison_test(void);
 void math_cmp_test(void);
 void callsave_test(void);
 void builtin_frame_address_test(void);
+void attrib_test(void);
 
 int fib(int n);
 void num(int n);
@@ -702,6 +703,7 @@ int main(int argc, char **argv)
     intdiv_test();
     if (via_volatile (42) != 42)
       printf ("via_volatile broken\n");
+    attrib_test();
     return 0; 
 }
 
@@ -2957,3 +2959,34 @@ char via_volatile (char i)
   vi = i;
   return vi;
 }
+
+struct __attribute__((__packed__)) Spacked {
+    char a;
+    short b;
+    int c;
+};
+struct Spacked spacked;
+typedef struct __attribute__((__packed__)) {
+    char a;
+    short b;
+    int c;
+} Spacked2;
+Spacked2 spacked2;
+#ifdef BROKEN
+/* This doesn't work for now.  Requires adjusting field offsets/sizes
+   after parsing the struct members.  */
+typedef struct Spacked3_s {
+    char a;
+    short b;
+    int c;
+} __attribute__((__packed__)) Spacked3;
+Spacked3 spacked3;
+#endif
+void attrib_test(void)
+{
+  printf("attr: %d %d %d %d\n", sizeof(struct Spacked),
+	 sizeof(spacked), sizeof(Spacked2), sizeof(spacked2));
+#ifdef BROKEN
+  printf("attr: %d %d\n", sizeof(Spacked3), sizeof(spacked3));
+#endif
+}