diff --git a/x86/aes-decrypt-internal.asm b/x86/aes-decrypt-internal.asm
index 90a497689aa81be8b361b9406780025d6435d971..f97fa093498836d3064a6fbc5b77d6d3d3ab50a6 100644
--- a/x86/aes-decrypt-internal.asm
+++ b/x86/aes-decrypt-internal.asm
@@ -58,7 +58,7 @@ C %edi is a temporary, often used as an accumulator.
 	C	       unsigned length, uint8_t *dst,
 	C	       uint8_t *src)
 	.text
-	.align 16
+	ALIGN(4)
 PROLOGUE(_nettle_aes_decrypt)
 	C save all registers that need to be saved
 	pushl	%ebx		C  20(%esp)
@@ -90,7 +90,7 @@ PROLOGUE(_nettle_aes_decrypt)
 
 	addl	$16,KEY		C  point to next key
 	movl	KEY,FRAME_KEY
-	.align 16
+	ALIGN(4)
 .Lround_loop:
 	AES_ROUND(T, SA,SD,SC,SB, TMP, KEY)
 	pushl	TMP
diff --git a/x86/aes-encrypt-internal.asm b/x86/aes-encrypt-internal.asm
index 33e4570c4684f49636237e9ce3f02bf29366129e..8fe041f0f393e27d8454fbb53c828698f90b0169 100644
--- a/x86/aes-encrypt-internal.asm
+++ b/x86/aes-encrypt-internal.asm
@@ -58,7 +58,7 @@ C %edi is a temporary, often used as an accumulator.
 	C	       unsigned length, uint8_t *dst,
 	C	       uint8_t *src)
 	.text
-	.align 16
+	ALIGN(4)
 PROLOGUE(_nettle_aes_encrypt)
 	C save all registers that need to be saved
 	pushl	%ebx		C  20(%esp)
@@ -90,7 +90,7 @@ PROLOGUE(_nettle_aes_encrypt)
 
 	addl	$16,KEY		C  point to next key
 	movl	KEY,FRAME_KEY
-	.align 16
+	ALIGN(4)
 .Lround_loop:
 	AES_ROUND(T, SA,SB,SC,SD, TMP, KEY)
 	pushl	TMP
diff --git a/x86/arcfour-crypt.asm b/x86/arcfour-crypt.asm
index 5c87ff8c2007f8c3a1c46f7def794c769e2004b5..8bf0453950284e2d92f3ea3672d6bb4863a2a268 100644
--- a/x86/arcfour-crypt.asm
+++ b/x86/arcfour-crypt.asm
@@ -23,7 +23,7 @@ C MA 02111-1307, USA.
 	C               unsigned length, uint8_t *dst,
 	C               const uint8_t *src)
 	.text
-	.align 16
+	ALIGN(4)
 PROLOGUE(nettle_arcfour_crypt)
 	C save all registers that need to be saved
 	pushl	%ebx		C  12(%esp)
diff --git a/x86/md5-compress.asm b/x86/md5-compress.asm
index 58d9b9799750854c19a15032c091c3549fc3aa18..96647543c4d9627b8b2ac27dda89352592d22ebe 100644
--- a/x86/md5-compress.asm
+++ b/x86/md5-compress.asm
@@ -68,7 +68,7 @@ define(<ROUND>,<
 	C _nettle_md5_compress(uint32_t *state, uint8_t *data)
 	
 	.text
-	.align 16
+	ALIGN(4)
 PROLOGUE(_nettle_md5_compress)
 	C save all registers that need to be saved
 
diff --git a/x86/sha1-compress.asm b/x86/sha1-compress.asm
index b37ace371cebaf2399a9295b4033385414f84da0..a155fab1fe670dccdac89708f49dca18aa54d66b 100644
--- a/x86/sha1-compress.asm
+++ b/x86/sha1-compress.asm
@@ -119,7 +119,7 @@ C adding, and then rotating back.
 	C _nettle_sha1_compress(uint32_t *state, uint8_t *data)
 	
 	.text
-	.align 16
+	ALIGN(4)
 PROLOGUE(_nettle_sha1_compress)
 	C save all registers that need to be saved