diff --git a/lib/libmd/i386/rmd160.S b/lib/libmd/i386/rmd160.S
index b94d560f78f0..97193e9bad8d 100644
--- a/lib/libmd/i386/rmd160.S
+++ b/lib/libmd/i386/rmd160.S
@@ -30,7 +30,7 @@
 
 #if defined(ELF) || defined(SOL)
 #define OK              1
-#define ALIGN           16
+#define ALIGN           4
 #endif
 
 #ifndef OK
@@ -52,7 +52,7 @@ BSDI - a.out with a very primative version of as.
 	.version	"01.01"
 gcc2_compiled.:
 .text
-	.align ALIGN
+	.p2align ALIGN
 .globl ripemd160_block_x86
 	TYPE(ripemd160_block_x86,@function)
 ripemd160_block_x86:
diff --git a/lib/libmd/i386/sha.S b/lib/libmd/i386/sha.S
index 15b07b96550a..ae8f89ee8d0d 100644
--- a/lib/libmd/i386/sha.S
+++ b/lib/libmd/i386/sha.S
@@ -31,7 +31,7 @@
 
 #if defined(ELF) || defined(SOL)
 #define OK              1
-#define ALIGN           16
+#define ALIGN           4
 #endif
 
 #ifndef OK
@@ -53,7 +53,7 @@ BSDI - a.out with a very primative version of as.
 	.version	"01.01"
 gcc2_compiled.:
 .text
-	.align ALIGN
+	.p2align ALIGN
 .globl sha1_block_x86
 	TYPE(sha1_block_x86,@function)
 sha1_block_x86: