diff --git a/sys/amd64/amd64/mpboot.S b/sys/amd64/amd64/mpboot.S
index f47f49ff9adb..8a6af0a5b11e 100644
--- a/sys/amd64/amd64/mpboot.S
+++ b/sys/amd64/amd64/mpboot.S
@@ -31,7 +31,7 @@
  * mpboot.s:	FreeBSD machine support for the Intel MP Spec
  *		multiprocessor systems.
  *
- *	$Id: mpboot.s,v 1.1 1997/04/26 11:45:17 peter Exp $
+ *	$Id: mpboot.s,v 1.2 1997/06/22 16:03:22 peter Exp $
  */
 
 
@@ -70,7 +70,7 @@
 /*
  * the APs enter here from their trampoline code (bootMP, below)
  */
-	.align	4
+	.p2align 4
 
 NON_GPROF_ENTRY(MPentry)
 	CHECKPOINT(0x36, 3)
@@ -229,7 +229,7 @@ dead:	hlt /* We should never get here */
 /*
  * MP boot strap Global Descriptor Table
  */
-	.align	4
+	.p2align 4
 	.globl	_MP_GDT
 	.globl	_bootCodeSeg
 	.globl	_bootDataSeg
diff --git a/sys/i386/i386/mpboot.s b/sys/i386/i386/mpboot.s
index f47f49ff9adb..8a6af0a5b11e 100644
--- a/sys/i386/i386/mpboot.s
+++ b/sys/i386/i386/mpboot.s
@@ -31,7 +31,7 @@
  * mpboot.s:	FreeBSD machine support for the Intel MP Spec
  *		multiprocessor systems.
  *
- *	$Id: mpboot.s,v 1.1 1997/04/26 11:45:17 peter Exp $
+ *	$Id: mpboot.s,v 1.2 1997/06/22 16:03:22 peter Exp $
  */
 
 
@@ -70,7 +70,7 @@
 /*
  * the APs enter here from their trampoline code (bootMP, below)
  */
-	.align	4
+	.p2align 4
 
 NON_GPROF_ENTRY(MPentry)
 	CHECKPOINT(0x36, 3)
@@ -229,7 +229,7 @@ dead:	hlt /* We should never get here */
 /*
  * MP boot strap Global Descriptor Table
  */
-	.align	4
+	.p2align 4
 	.globl	_MP_GDT
 	.globl	_bootCodeSeg
 	.globl	_bootDataSeg
diff --git a/sys/i386/i386/mplock.s b/sys/i386/i386/mplock.s
index 7eb21136254e..df9042cc0245 100644
--- a/sys/i386/i386/mplock.s
+++ b/sys/i386/i386/mplock.s
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: mplock.s,v 1.17 1997/08/10 20:59:07 fsmp Exp $
+ * $Id: mplock.s,v 1.18 1997/08/20 05:25:47 fsmp Exp $
  *
  * Functions for locking between CPUs in a SMP system.
  *
@@ -445,7 +445,7 @@ NON_GPROF_ENTRY(rel_altsyscall_lock)
  * 
  */
 	.data
-	.align  2			/* xx_lock aligned on int boundary */
+	.p2align 2			/* xx_lock aligned on int boundary */
 
 	.globl _mp_lock
 _mp_lock:	.long	0