diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 40c45f397140..113de40fa0d1 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6.c,v 1.60 2002/06/07 04:03:53 itojun Exp $	*/
+/*	$NetBSD: in6.c,v 1.61 2002/06/07 04:07:55 itojun Exp $	*/
 /*	$KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $	*/
 
 /*
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.60 2002/06/07 04:03:53 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.61 2002/06/07 04:07:55 itojun Exp $");
 
 #include "opt_inet.h"
 
@@ -363,7 +363,7 @@ in6_control(so, cmd, data, ifp, p)
 	case SIOCSIFINFO_FLAGS:
 		if (!privileged)
 			return(EPERM);
-		/* fall through */
+		/* FALLTHORUGH */
 	case OSIOCGIFINFO_IN6:
 	case SIOCGIFINFO_IN6:
 	case SIOCGDRLST_IN6:
@@ -391,7 +391,7 @@ in6_control(so, cmd, data, ifp, p)
 	case SIOCDLIFADDR:
 		if (!privileged)
 			return(EPERM);
-		/* fall through */
+		/* FALLTHORUGH */
 	case SIOCGLIFADDR:
 		return in6_lifaddr_ioctl(so, cmd, data, ifp, p);
 	}
@@ -539,7 +539,7 @@ in6_control(so, cmd, data, ifp, p)
 
 	case SIOCGIFADDR_IN6:
 		/* This interface is basically deprecated. use SIOCGIFCONF. */
-		/* fall through */
+		/* FALLTHORUGH */
 	case SIOCGIFAFLAG_IN6:
 	case SIOCGIFNETMASK_IN6:
 	case SIOCGIFDSTADDR_IN6:
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index d86d37e496aa..686965082580 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_forward.c,v 1.28 2002/05/29 07:53:41 itojun Exp $	*/
+/*	$NetBSD: ip6_forward.c,v 1.29 2002/06/07 04:07:55 itojun Exp $	*/
 /*	$KAME: ip6_forward.c,v 1.74 2001/06/12 23:54:55 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.28 2002/05/29 07:53:41 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.29 2002/06/07 04:07:55 itojun Exp $");
 
 #include "opt_ipsec.h"
 #include "opt_pfil_hooks.h"
@@ -272,7 +272,7 @@ ip6_forward(m, srcrt)
 			break;
 		default:
 			printf("ip6_output (ipsec): error code %d\n", error);
-			/* fall through */
+			/* FALLTHORUGH */
 		case ENOENT:
 			/* don't show these error codes to the user */
 			break;
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index f0c1e0134439..08a75ead73b2 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_mroute.c,v 1.30 2002/05/30 04:39:15 itojun Exp $	*/
+/*	$NetBSD: ip6_mroute.c,v 1.31 2002/06/07 04:07:55 itojun Exp $	*/
 /*	$KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $	*/
 
 /*
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.30 2002/05/30 04:39:15 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.31 2002/06/07 04:07:55 itojun Exp $");
 
 #include "opt_inet.h"
 
@@ -195,7 +195,7 @@ static int pim6;
 	       switch (xxs) { \
 		      case 2: \
 			  delta += 1000000; \
-			      /* fall through */ \
+			      /* FALLTHORUGH */ \
 		      case 1: \
 			  delta += 1000000; \
 			  break; \
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 5aa2940337bc..0a621986de31 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_output.c,v 1.46 2002/05/31 03:18:54 itojun Exp $	*/
+/*	$NetBSD: ip6_output.c,v 1.47 2002/06/07 04:07:55 itojun Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 
 /*
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.46 2002/05/31 03:18:54 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.47 2002/06/07 04:07:55 itojun Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -385,7 +385,7 @@ ip6_output(m0, opt, ro, flags, im6o, ifpp)
 				break;
 			default:
 				printf("ip6_output (ipsec): error code %d\n", error);
-				/* fall through */
+				/* FALLTHORUGH */
 			case ENOENT:
 				/* don't show these error codes to the user */
 				error = 0;
@@ -510,7 +510,7 @@ skip_ipsec2:;
 				break;
 			default:
 				printf("ip6_output (ipsec): error code %d\n", error);
-				/* fall through */
+				/* FALLTHORUGH */
 			case ENOENT:
 				/* don't show these error codes to the user */
 				error = 0;
@@ -1005,7 +1005,7 @@ freehdrs:
 	m_freem(exthdrs.ip6e_dest1);
 	m_freem(exthdrs.ip6e_rthdr);
 	m_freem(exthdrs.ip6e_dest2);
-	/* fall through */
+	/* FALLTHORUGH */
 bad:
 	m_freem(m);
 	goto done;
@@ -1278,7 +1278,7 @@ ip6_ctloutput(op, so, level, optname, mp)
 					error = EPERM;
 					break;
 				}
-				/* fall through */
+				/* FALLTHORUGH */
 			case IPV6_UNICAST_HOPS:
 			case IPV6_RECVOPTS:
 			case IPV6_RECVRETOPTS:
@@ -1466,7 +1466,7 @@ else \
 					error = EPERM;
 					break;
 				}
-				/* fall through */
+				/* FALLTHORUGH */
 			case IPV6_UNICAST_HOPS:
 			case IPV6_RECVOPTS:
 			case IPV6_RECVRETOPTS: