diff --git a/Makefile b/Makefile
index f59af70f1610720e1115af369d801d2e34831450..bdde7c8251f192a903fa31b9bb56a77dedd56801 100644
--- a/Makefile
+++ b/Makefile
@@ -645,7 +645,6 @@ lib.clib: ${CLIB_MOD_OBJS}
 # Derived headers:
 derived.swis: o.swis
 	${LD} -bin -o $@ o.SWIs
-	stripnulls $@
 	settype $@ text
 
 o.swis: s.makehswis h.swisheader s.swioptions
diff --git a/s/makehswis b/s/makehswis
index 921f63320a0694cc24f5e765de8bbe5407ecf2b6..d3dcf204c576da9cc885edd5e1023c48e8de7c6f 100644
--- a/s/makehswis
+++ b/s/makehswis
@@ -122,4 +122,7 @@ string2 SETS    "&":CC:(:STR:value)
         =       10
         =       "#endif", 10
 
+; Pad to word align with harmless newlines
+        ALIGN   4, 0, 10
+
         END