diff --git a/lib/librumpuser/rumpuser_dl.c b/lib/librumpuser/rumpuser_dl.c
index 171d844b800b..017b0cbd09a6 100644
--- a/lib/librumpuser/rumpuser_dl.c
+++ b/lib/librumpuser/rumpuser_dl.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: rumpuser_dl.c,v 1.30 2014/11/04 19:05:17 pooka Exp $	*/
+/*      $NetBSD: rumpuser_dl.c,v 1.31 2019/12/26 04:53:11 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -40,7 +40,7 @@
 #include "rumpuser_port.h"
 
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser_dl.c,v 1.30 2014/11/04 19:05:17 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_dl.c,v 1.31 2019/12/26 04:53:11 msaitoh Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
@@ -225,7 +225,7 @@ getsymbols(struct link_map *map, int ismainobj)
 		 * DT_GNU_HASH is a bit more complicated than DT_HASH
 		 * in this regard since apparently there is no field
 		 * telling us the total symbol count.  Instead, we look
-		 * for the last valid hash bucket and add its chain lenght
+		 * for the last valid hash bucket and add its chain length
 		 * to the bucket's base index.
 		 */
 		case DT_GNU_HASH: {
diff --git a/sys/altq/altq_blue.c b/sys/altq/altq_blue.c
index 83067bf71fe9..90eb06f3c937 100644
--- a/sys/altq/altq_blue.c
+++ b/sys/altq/altq_blue.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_blue.c,v 1.24 2016/04/20 08:58:48 knakahara Exp $	*/
+/*	$NetBSD: altq_blue.c,v 1.25 2019/12/26 04:53:11 msaitoh Exp $	*/
 /*	$KAME: altq_blue.c,v 1.15 2005/04/13 03:44:24 suz Exp $	*/
 
 /*
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_blue.c,v 1.24 2016/04/20 08:58:48 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_blue.c,v 1.25 2019/12/26 04:53:11 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
@@ -105,7 +105,7 @@ __KERNEL_RCSID(0, "$NetBSD: altq_blue.c,v 1.24 2016/04/20 08:58:48 knakahara Exp
 /* fixed-point uses 12-bit decimal places */
 #define	FP_SHIFT	12	/* fixed-point shift */
 
-#define	BLUE_LIMIT	200	/* default max queue lenght */
+#define	BLUE_LIMIT	200	/* default max queue length */
 #define	BLUE_STATS		/* collect statistics */
 
 /* blue_list keeps all blue_state_t's allocated. */
diff --git a/sys/altq/altq_red.c b/sys/altq/altq_red.c
index a5d074e9a383..9c73ffad734a 100644
--- a/sys/altq/altq_red.c
+++ b/sys/altq/altq_red.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_red.c,v 1.31 2018/11/15 10:23:55 maxv Exp $	*/
+/*	$NetBSD: altq_red.c,v 1.32 2019/12/26 04:53:11 msaitoh Exp $	*/
 /*	$KAME: altq_red.c,v 1.20 2005/04/13 03:44:25 suz Exp $	*/
 
 /*
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_red.c,v 1.31 2018/11/15 10:23:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_red.c,v 1.32 2019/12/26 04:53:11 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
@@ -165,7 +165,7 @@ __KERNEL_RCSID(0, "$NetBSD: altq_red.c,v 1.31 2018/11/15 10:23:55 maxv Exp $");
 #define	TH_MIN		5	/* min threshold */
 #define	TH_MAX		15	/* max threshold */
 
-#define	RED_LIMIT	60	/* default max queue lenght */
+#define	RED_LIMIT	60	/* default max queue length */
 #define	RED_STATS		/* collect statistics */
 
 /*
diff --git a/sys/altq/altq_rio.c b/sys/altq/altq_rio.c
index 4abf3bb8470d..4a0d4a88dcce 100644
--- a/sys/altq/altq_rio.c
+++ b/sys/altq/altq_rio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_rio.c,v 1.23 2016/05/16 09:53:59 ozaki-r Exp $	*/
+/*	$NetBSD: altq_rio.c,v 1.24 2019/12/26 04:53:11 msaitoh Exp $	*/
 /*	$KAME: altq_rio.c,v 1.19 2005/04/13 03:44:25 suz Exp $	*/
 
 /*
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_rio.c,v 1.23 2016/05/16 09:53:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_rio.c,v 1.24 2019/12/26 04:53:11 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
@@ -153,7 +153,7 @@ __KERNEL_RCSID(0, "$NetBSD: altq_rio.c,v 1.23 2016/05/16 09:53:59 ozaki-r Exp $"
 #define	TH_MIN		 5	/* min threshold */
 #define	TH_MAX		15	/* max threshold */
 
-#define	RIO_LIMIT	60	/* default max queue lenght */
+#define	RIO_LIMIT	60	/* default max queue length */
 #define	RIO_STATS		/* collect statistics */
 
 #define	TV_DELTA(a, b, delta) {					\
diff --git a/sys/arch/arm/imx/imxecspireg.h b/sys/arch/arm/imx/imxecspireg.h
index c0d0234f9976..205086becc05 100644
--- a/sys/arch/arm/imx/imxecspireg.h
+++ b/sys/arch/arm/imx/imxecspireg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: imxecspireg.h,v 1.2 2019/09/27 02:59:21 hkenken Exp $	*/
+/*	$NetBSD: imxecspireg.h,v 1.3 2019/12/26 04:53:11 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2012  Genetec Corporation.  All rights reserved.
@@ -43,7 +43,7 @@
 #define	 ECSPI_CON_HW		__BIT(1)	/* HW */
 #define	 ECSPI_CON_ENABLE	__BIT(0)	/* EN */
 #define	ECSPI_CONFIGREG		0x0c
-#define	 ECSPI_CONFIG_HT_LEN	__BITS(28,24)	/* HT LENGHT */
+#define	 ECSPI_CONFIG_HT_LEN	__BITS(28,24)	/* HT LENGTH */
 #define	 ECSPI_CONFIG_SCLK_CTL	__BITS(23,20)	/* SCLK CTL */
 #define	 ECSPI_CONFIG_DATA_CTL	__BITS(19,16)	/* DATA CTL */
 #define	 ECSPI_CONFIG_SSB_POL	__BITS(15,12)	/* SSB POL */
diff --git a/sys/arch/ia64/include/bootinfo.h b/sys/arch/ia64/include/bootinfo.h
index 8ae60cc3d2dd..80e4a59d5936 100644
--- a/sys/arch/ia64/include/bootinfo.h
+++ b/sys/arch/ia64/include/bootinfo.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootinfo.h,v 1.1 2006/04/07 14:21:18 cherry Exp $	*/
+/*	$NetBSD: bootinfo.h,v 1.2 2019/12/26 04:53:11 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -42,7 +42,7 @@ struct bootinfo {
 	uint32_t	bi_memdesc_version;	/* EFI memory desc version */
 	uint32_t	bi_spare2;
 	uint64_t	bi_unwindtab;		/* start of ia64 unwind table */
-	uint64_t	bi_unwindtablen;	/* lenght of the table, in bytes */
+	uint64_t	bi_unwindtablen;	/* length of the table, in bytes */
 	uint64_t	bi_symtab;		/* start of kernel sym table */
 	uint64_t	bi_esymtab;		/* end of kernel sym table */
 	uint64_t	bi_kernend;		/* end of kernel space */
diff --git a/sys/arch/sgimips/mace/if_mec.c b/sys/arch/sgimips/mace/if_mec.c
index e3b982b1eae9..6bd86c8a557f 100644
--- a/sys/arch/sgimips/mace/if_mec.c
+++ b/sys/arch/sgimips/mace/if_mec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mec.c,v 1.61 2019/05/30 02:32:17 msaitoh Exp $ */
+/* $NetBSD: if_mec.c,v 1.62 2019/12/26 04:53:11 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2004, 2008 Izumi Tsutsui.  All rights reserved.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.61 2019/05/30 02:32:17 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.62 2019/12/26 04:53:11 msaitoh Exp $");
 
 #include "opt_ddb.h"
 
@@ -1174,7 +1174,7 @@ mec_start(struct ifnet *ifp)
 				nptr = 1;
 
 				/*
-				 * Set lenght of unaligned part which will be
+				 * Set length of unaligned part which will be
 				 * copied into txdesc buffer.
 				 */
 				buflen = MEC_TXD_ALIGN - MEC_ETHER_ALIGN;
diff --git a/sys/dev/flash/flash.c b/sys/dev/flash/flash.c
index 6bd85fb4cd20..a13bf9ef95de 100644
--- a/sys/dev/flash/flash.c
+++ b/sys/dev/flash/flash.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: flash.c,v 1.14 2017/11/13 17:35:58 jmcneill Exp $	*/
+/*	$NetBSD: flash.c,v 1.15 2019/12/26 04:53:11 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2011 Department of Software Engineering,
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.14 2017/11/13 17:35:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.15 2019/12/26 04:53:11 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -349,7 +349,7 @@ flashstrategy(struct buf * const bp)
 		goto done;
 	}
 
-	/* zero lenght i/o */
+	/* zero length i/o */
 	if (bp->b_bcount == 0) {
 		goto done;
 	}
diff --git a/sys/dev/marvell/ehci_mv.c b/sys/dev/marvell/ehci_mv.c
index c72618c7fa24..8c110d17bd26 100644
--- a/sys/dev/marvell/ehci_mv.c
+++ b/sys/dev/marvell/ehci_mv.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci_mv.c,v 1.7 2018/04/09 16:21:10 jakllsch Exp $	*/
+/*	$NetBSD: ehci_mv.c,v 1.8 2019/12/26 04:53:12 msaitoh Exp $	*/
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_mv.c,v 1.7 2018/04/09 16:21:10 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_mv.c,v 1.8 2019/12/26 04:53:12 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -324,7 +324,7 @@ mvusb_init(struct mvusb_softc *sc, enum marvell_tags *tags)
 		reg &= ~(1 << 21);
 		/* bits[27:26]=0 (EDGE_DET_SEL=0) */
 		reg &= ~(3 << 26);
-		/* bits[31:30]=3 (RXDATA_BLOCK_LENGHT=3) */
+		/* bits[31:30]=3 (RXDATA_BLOCK_LENGTH=3) */
 		reg |= (3 << 30);
 		/* bits[7:4]=1 (SQ_THRESH=1) */
 		reg &= ~(0xf << 4);
diff --git a/sys/dev/nand/onfi.h b/sys/dev/nand/onfi.h
index 113edc7f629c..db196608a83c 100644
--- a/sys/dev/nand/onfi.h
+++ b/sys/dev/nand/onfi.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: onfi.h,v 1.1 2011/02/26 18:07:31 ahoka Exp $	*/
+/*	$NetBSD: onfi.h,v 1.2 2019/12/26 04:53:12 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -117,7 +117,7 @@ struct onfi_parameter_page {
 	uint16_t param_features;  /* M: features supported */
 	uint16_t param_optional_cmds; /* M: optional commands */
 	uint16_t param_reserved_1;    /* R: reserved */
-	uint16_t param_extended_len;  /* O: extended parameter page lenght */
+	uint16_t param_extended_len;  /* O: extended parameter page length */
 	uint8_t param_num_param_pg;  /* O: number of parameter pages */
 	uint8_t param_reserved_2[17]; /* R: reserved */
 	/* Manufacturer information block */
diff --git a/usr.sbin/mmcformat/mmcformat.c b/usr.sbin/mmcformat/mmcformat.c
index 6ee2d7472670..df7d2892f945 100644
--- a/usr.sbin/mmcformat/mmcformat.c
+++ b/usr.sbin/mmcformat/mmcformat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mmcformat.c,v 1.5 2019/02/04 09:53:41 mrg Exp $ */
+/* $NetBSD: mmcformat.c,v 1.6 2019/12/26 04:53:12 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -343,7 +343,7 @@ print_format(int format_tp, uint32_t num_blks, uint32_t param,
 		break;
 	case  0x05 :
 		format_str = "fixed length zone'd format";
-		nblks_str  = "zone lenght";
+		nblks_str  = "zone length";
 		param_str  = "last zone number";
 		*supported = 0;
 		break;
diff --git a/usr.sbin/sysinst/partitions.h b/usr.sbin/sysinst/partitions.h
index e9f4093eb184..bdb692916b55 100644
--- a/usr.sbin/sysinst/partitions.h
+++ b/usr.sbin/sysinst/partitions.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: partitions.h,v 1.11 2019/12/15 12:01:05 martin Exp $	*/
+/*	$NetBSD: partitions.h,v 1.12 2019/12/26 04:53:12 msaitoh Exp $	*/
 
 /*
  * Copyright 2018 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
 #endif
 
 #define	MAX_LABEL_LEN		128	/* max. length of a partition label */
-#define	MAX_SHORTCUT_LEN	8	/* max. lenght of a shortcut ("a:") */
+#define	MAX_SHORTCUT_LEN	8	/* max. length of a shortcut ("a:") */
 
 /*
  * A partition index / handle, identifies a singlepartition within
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 368b342ad133..69ea58bdf63e 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: syslogd.c,v 1.131 2019/02/03 03:19:31 mrg Exp $	*/
+/*	$NetBSD: syslogd.c,v 1.132 2019/12/26 04:53:12 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993, 1994\
 #if 0
 static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #else
-__RCSID("$NetBSD: syslogd.c,v 1.131 2019/02/03 03:19:31 mrg Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.132 2019/12/26 04:53:12 msaitoh Exp $");
 #endif
 #endif /* not lint */
 
@@ -2001,7 +2001,7 @@ logmsg(struct buf_msg *buffer)
  * format one buffer into output format given by flag BSDOutputFormat
  * line is allocated and has to be free()d by caller
  * size_t pointers are optional, if not NULL then they will return
- *   different lenghts used for formatting and output
+ *   different lengths used for formatting and output
  */
 #define OUT(x) ((x)?(x):"-")
 bool