diff --git a/spice/end-packed.h b/spice/end-packed.h
index e191737..1acea18 100644
--- a/spice/end-packed.h
+++ b/spice/end-packed.h
@@ -33,8 +33,6 @@
 
 #undef SPICE_ATTR_PACKED
 
-#ifndef __GNUC__
-
+#if defined(__MINGW32__) || !defined(__GNUC__)
 #pragma pack(pop)
-
 #endif
diff --git a/spice/start-packed.h b/spice/start-packed.h
index 78ec7c7..ab3fa98 100644
--- a/spice/start-packed.h
+++ b/spice/start-packed.h
@@ -49,6 +49,10 @@
 
 #define SPICE_ATTR_PACKED __attribute__ ((__packed__))
 
+#ifdef __MINGW32__
+#pragma pack(push,1)
+#endif
+
 #else
 
 #pragma pack(push)