diff --git a/ghc/compiler/nativeGen/PprMach.lhs b/ghc/compiler/nativeGen/PprMach.lhs
index 766c2b32e47be1013fe86437303da69f2b80fc02..3e8bde036ff9f185453d680dea3cfe1afb574ca3 100644
--- a/ghc/compiler/nativeGen/PprMach.lhs
+++ b/ghc/compiler/nativeGen/PprMach.lhs
@@ -400,16 +400,24 @@ pprInstr (SEGMENT TextSegment)
     = ptext
 	 IF_ARCH_alpha(SLIT("\t.text\n\t.align 3") {-word boundary-}
 	,IF_ARCH_sparc(SLIT("\t.text\n\t.align 4") {-word boundary-}
-	,IF_ARCH_i386((_PK_ ".text\n\t.align 2\x2c\&0x90") {-needs per-OS variation!-}
+	,IF_ARCH_i386((_PK_ ".text\n\t.align 4") {-needs per-OS variation!-}
 	,)))
 
+#if 0
+	,IF_ARCH_i386((_PK_ ".text\n\t.align 2\x2c\&0x90") {-needs per-OS variation!-}
+#endif
+
 pprInstr (SEGMENT DataSegment)
     = ptext
 	 IF_ARCH_alpha(SLIT("\t.data\n\t.align 3")
 	,IF_ARCH_sparc(SLIT("\t.data\n\t.align 8") {-<8 will break double constants -}
-	,IF_ARCH_i386(SLIT(".data\n\t.align 2")
+	,IF_ARCH_i386(SLIT(".data\n\t.align 4")
 	,)))
 
+#if 0
+	,IF_ARCH_i386(SLIT(".data\n\t.align 2")
+#endif
+
 pprInstr (LABEL clab)
   = let
 	pp_lab = pprCLabel_asm clab