diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index 33e047f6b98c..9cdf3fe7e406 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clnt_raw.c,v 1.26 2005/06/09 22:13:17 yamt Exp $	*/
+/*	$NetBSD: clnt_raw.c,v 1.27 2005/07/30 11:11:46 wiz Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
 static char *sccsid = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)clnt_raw.c	2.2 88/08/01 4.0 RPCSRC";
 #else
-__RCSID("$NetBSD: clnt_raw.c,v 1.26 2005/06/09 22:13:17 yamt Exp $");
+__RCSID("$NetBSD: clnt_raw.c,v 1.27 2005/07/30 11:11:46 wiz Exp $");
 #endif
 #endif
 
@@ -47,7 +47,7 @@ __RCSID("$NetBSD: clnt_raw.c,v 1.26 2005/06/09 22:13:17 yamt Exp $");
  * Memory based rpc for simple testing and timing.
  * Interface to create an rpc client and server in the same process.
  * This lets us similate rpc and get round trip overhead, without
- * any interference from the kernal.
+ * any interference from the kernel.
  */
 
 #include "namespace.h"
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
index 185c37e48887..4433b2c34a1f 100644
--- a/lib/libc/rpc/svc_raw.c
+++ b/lib/libc/rpc/svc_raw.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svc_raw.c,v 1.18 2005/06/09 22:13:17 yamt Exp $	*/
+/*	$NetBSD: svc_raw.c,v 1.19 2005/07/30 11:11:46 wiz Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)svc_raw.c 1.25 89/01/31 Copyr 1984 Sun Micro";
 #else
-__RCSID("$NetBSD: svc_raw.c,v 1.18 2005/06/09 22:13:17 yamt Exp $");
+__RCSID("$NetBSD: svc_raw.c,v 1.19 2005/07/30 11:11:46 wiz Exp $");
 #endif
 #endif
 
@@ -47,7 +47,7 @@ __RCSID("$NetBSD: svc_raw.c,v 1.18 2005/06/09 22:13:17 yamt Exp $");
  * svc_raw.c,   This a toy for simple testing and timing.
  * Interface to create an rpc client and server in the same UNIX process.
  * This lets us similate rpc and get rpc (round trip) overhead, without
- * any interference from the kernal.
+ * any interference from the kernel.
  *
  */
 
diff --git a/sys/arch/amd64/include/vmparam.h b/sys/arch/amd64/include/vmparam.h
index c351e1a4b80b..a4b3264a827d 100644
--- a/sys/arch/amd64/include/vmparam.h
+++ b/sys/arch/amd64/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.8 2005/03/26 05:12:34 fvdl Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.9 2005/07/30 11:11:46 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -57,7 +57,7 @@
  * the kernel stack.
  *
  * Immediately after the user structure is the page table map, and then
- * kernal address space.
+ * kernel address space.
  */
 #define	USRSTACK	VM_MAXUSER_ADDRESS
 
diff --git a/sys/arch/pc532/include/vmparam.h b/sys/arch/pc532/include/vmparam.h
index 4035492469e4..6e6af635d9d9 100644
--- a/sys/arch/pc532/include/vmparam.h
+++ b/sys/arch/pc532/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.30 2004/01/23 04:03:38 simonb Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.31 2005/07/30 11:11:46 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -57,7 +57,7 @@
  * the kernel stack.
  *
  * Immediately after the user structure is the page table map, and then
- * kernal address space.
+ * kernel address space.
  */
 #define	USRSTACK	VM_MAXUSER_ADDRESS