diff --git a/lib/libc/arch/x86_64/string/memchr.S b/lib/libc/arch/x86_64/string/memchr.S
index 7af5385b8b9f..22b5f680520a 100644
--- a/lib/libc/arch/x86_64/string/memchr.S
+++ b/lib/libc/arch/x86_64/string/memchr.S
@@ -6,14 +6,14 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: memchr.S,v 1.3 2004/07/19 20:04:41 drochner Exp $")
+	RCSID("$NetBSD: memchr.S,v 1.4 2005/08/02 14:20:49 rpaulo Exp $")
 #endif
 
 ENTRY(memchr)
 	movzbq	%sil,%rcx
 
 	/*
-	 * Align to word boundry
+	 * Align to word boundary.
 	 * Consider unrolling loop?
 	 */
 	testq	%rdx,%rdx	/* nbytes == 0? */
diff --git a/lib/libc/arch/x86_64/string/strcmp.S b/lib/libc/arch/x86_64/string/strcmp.S
index 29ffee458897..70f16fea9c4b 100644
--- a/lib/libc/arch/x86_64/string/strcmp.S
+++ b/lib/libc/arch/x86_64/string/strcmp.S
@@ -6,7 +6,7 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: strcmp.S,v 1.3 2004/07/19 20:04:41 drochner Exp $")
+	RCSID("$NetBSD: strcmp.S,v 1.4 2005/08/02 14:20:49 rpaulo Exp $")
 #endif
 
 ENTRY(strcmp)
@@ -28,7 +28,7 @@ ENTRY(strcmp)
 	jmp	.Ldone
 
 	/*
-	 * Check whether s2 is aligned to a word boundry.  If it is, we
+	 * Check whether s2 is aligned to a word boundary.  If it is, we
 	 * can compare by words.  Otherwise we have to compare by bytes.
 	 */
 .Ls1aligned:
diff --git a/lib/libc/arch/x86_64/string/strlen.S b/lib/libc/arch/x86_64/string/strlen.S
index 1115972aeb35..bb787cbb9706 100644
--- a/lib/libc/arch/x86_64/string/strlen.S
+++ b/lib/libc/arch/x86_64/string/strlen.S
@@ -6,7 +6,7 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: strlen.S,v 1.3 2004/07/19 20:04:41 drochner Exp $")
+	RCSID("$NetBSD: strlen.S,v 1.4 2005/08/02 14:20:49 rpaulo Exp $")
 #endif
 
 ENTRY(strlen)
@@ -38,10 +38,10 @@ ENTRY(strlen)
 	 * original word is zero.
 	 *
 	 * It also has the useful property that bytes in the result word
-	 * that coorespond to non-zero bytes in the original word have
-	 * the value 0x00, while bytes cooresponding to zero bytes have
+	 * that correspond to non-zero bytes in the original word have
+	 * the value 0x00, while bytes corresponding to zero bytes have
 	 * the value 0x80. This allows calculation of the first (and
-	 * last) occurance of a zero byte within the word (useful for C's
+	 * last) occurrence of a zero byte within the word (useful for C's
 	 * str* primitives) by counting the number of leading (or
 	 * trailing) zeros and dividing the result by 8.  On machines
 	 * without (or with slow) clz() / ctz() instructions, testing
@@ -59,10 +59,10 @@ ENTRY(strlen)
 	 * original word is zero.
 	 *
 	 * On little endian machines, the first byte in the result word
-	 * that cooresponds to a zero byte in the original byte is 0x80,
+	 * that corresponds to a zero byte in the original byte is 0x80,
 	 * so clz() can be used as above.  On big endian machines, and
 	 * little endian machines without (or with a slow) clz() insn,
-	 * testing each byte in the original for zero is necessary
+	 * testing each byte in the original for zero is necessary.
 	 *
 	 * This typically takes 3 instructions (4 on machines without
 	 * "and with complement") not including those needed to load
diff --git a/lib/libc/arch/x86_64/string/swab.S b/lib/libc/arch/x86_64/string/swab.S
index 539285a66468..a9012d8216af 100644
--- a/lib/libc/arch/x86_64/string/swab.S
+++ b/lib/libc/arch/x86_64/string/swab.S
@@ -6,7 +6,7 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: swab.S,v 1.2 2003/07/26 19:24:40 salo Exp $")
+	RCSID("$NetBSD: swab.S,v 1.3 2005/08/02 14:20:49 rpaulo Exp $")
 #endif
 
 #define LOAD_SWAP_STORE_WORD \
@@ -20,7 +20,7 @@ ENTRY(swab)
 
 	shrq	$1,%rdx
 	testq	$7,%rdx			# copy first group of 1 to 7 words
-	jz	L2			# while swaping alternate bytes.
+	jz	L2			# while swapping alternate bytes.
 L1:	lodsw
 	rorw	$8,%ax
 	stosw