diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index e251a6a04431..0e41e9bf8b9a 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -1,24 +1,22 @@
-#	$NetBSD: Makefile,v 1.18 2000/06/23 06:01:12 thorpej Exp $
+#	$NetBSD: Makefile,v 1.19 2001/12/12 00:07:45 tv Exp $
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 
+# XXX Kerberos support broken right now.
+NOKERBEROS=	# defined
+
 .include <bsd.own.mk>
 
-PROG=	rcp
-SRCS=	rcp.c util.c
-
-# XXX Kerberos support broken right now.
-MKKERBEROS=no
+PROG=		rcp
+SRCS=		rcp.c util.c
 
 .if (${MKKERBEROS} != "no")
+RLOGIN= 	${.CURDIR}/../../usr.bin/rlogin
+.PATH:		${RLOGIN}
 
-RLOGIN= ${.CURDIR}/../../usr.bin/rlogin
-SRCS+=	krcmd.c kcmd.c
-CPPFLAGS+= -DKERBEROS -DCRYPT -I${RLOGIN}
-
-LDADD+= -lkrb -ldes
-DPADD+= ${LIBKRB} ${LIBDES}
-
-.PATH:	${RLOGIN}
+SRCS+=		krcmd.c kcmd.c
+CPPFLAGS+=	-DKERBEROS -DCRYPT -I${RLOGIN}
+LDADD+= 	-lkrb -ldes
+DPADD+= 	${LIBKRB} ${LIBDES}
 .endif
 
 .include <bsd.prog.mk>
diff --git a/etc/Makefile b/etc/Makefile
index d3bac67afbc1..829465b44956 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.198 2001/12/07 02:30:22 jmc Exp $
+#	$NetBSD: Makefile,v 1.199 2001/12/12 00:07:46 tv Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -31,6 +31,10 @@
 #	stuff for this target is found in etc.${MACHINE}/Makefile.inc.
 #    release: a synonym for `snapshot'
 
+# setting NOOBJ prevents "make obj" from doing anything;
+# an objdir would break the installation stuff below
+NOOBJ=		# defined
+
 # do this before bsd.own.mk so we get correct KERNSRCDIR
 .include "../Makefile.inc"
 
@@ -51,10 +55,6 @@ MKISOFS_FLAGS+= -J -l \
 		-P "The NetBSD Project" \
 		-m "${RELEASEDIR}/installation/cdrom"
 
-# setting NOOBJ prevents "make obj" from doing anything;
-# an objdir would break the installation stuff below
-MKOBJ=	no
-
 # MD Makefile.inc may append MD targets to BIN[123].  Make sure all
 # are empty, to preserve the old semantics of setting them below with "=".
 BIN1=	
diff --git a/etc/skel/Makefile b/etc/skel/Makefile
index 6d0b3ec0d48e..852382abbb55 100644
--- a/etc/skel/Makefile
+++ b/etc/skel/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2000/10/16 13:14:57 simonb Exp $
+#	$NetBSD: Makefile,v 1.2 2001/12/12 00:07:47 tv Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/8/93
 
 .if make(distribution)
@@ -10,6 +10,7 @@ FILESNAME_${F}=	${F:S/dot//}
 
 distribution: filesinstall
 .endif
-MKOBJ=	no
+
+NOOBJ=		# defined
 
 .include <bsd.prog.mk>
diff --git a/games/backgammon/common_source/Makefile b/games/backgammon/common_source/Makefile
index 27e42facdfdb..55a513b3078b 100644
--- a/games/backgammon/common_source/Makefile
+++ b/games/backgammon/common_source/Makefile
@@ -1,14 +1,12 @@
-#	$NetBSD: Makefile,v 1.5 1999/03/13 23:17:46 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2001/12/12 00:07:47 tv Exp $
 
-LIB=	common
-SRCS=	allow.c board.c check.c fancy.c init.c odds.c one.c save.c subs.c \
-	table.c
+LIB=		common
+SRCS=		allow.c board.c check.c fancy.c init.c odds.c \
+		one.c save.c subs.c table.c
 
-MKLINT=	no
-MKPIC=	no
-MKPROFILE=no
-
-# only needed during build
-libinstall::
+NOLINKLIB=	# defined
+NOLINT=		# defined
+NOPIC=		# defined
+NOPROFILE=	# defined
 
 .include <bsd.lib.mk>
diff --git a/games/backgammon/teachgammon/Makefile b/games/backgammon/teachgammon/Makefile
index 249e506c6bb3..e57824f776b1 100644
--- a/games/backgammon/teachgammon/Makefile
+++ b/games/backgammon/teachgammon/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.9 1999/02/13 02:54:20 lukem Exp $
+#	$NetBSD: Makefile,v 1.10 2001/12/12 00:07:47 tv Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
-PROG=	teachgammon
-SRCS=	data.c teach.c ttext1.c ttext2.c tutor.c
-MKMAN=	no
+PROG=		teachgammon
+SRCS=		data.c teach.c ttext1.c ttext2.c tutor.c
+NOMAN=		# defined
 
 .include <bsd.prog.mk>
diff --git a/games/boggle/mkdict/Makefile b/games/boggle/mkdict/Makefile
index 3ad910da4d93..78945c4ebc66 100644
--- a/games/boggle/mkdict/Makefile
+++ b/games/boggle/mkdict/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.10 2000/04/14 04:12:18 simonb Exp $
+#	$NetBSD: Makefile,v 1.11 2001/12/12 00:07:47 tv Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 HOSTPROG=	mkdict
 HOST_CPPFLAGS+=	-I${.CURDIR}/../boggle
-MKMAN=		no
+NOMAN=		# defined
 
 .include <bsd.hostprog.mk>
diff --git a/games/boggle/mkindex/Makefile b/games/boggle/mkindex/Makefile
index 539851c0a869..88ebc2076e96 100644
--- a/games/boggle/mkindex/Makefile
+++ b/games/boggle/mkindex/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.8 2000/04/14 04:12:19 simonb Exp $
+#	$NetBSD: Makefile,v 1.9 2001/12/12 00:07:48 tv Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 HOSTPROG=	mkindex
 HOST_CPPFLAGS+=	-I${.CURDIR}/../boggle
-MKMAN=		no
+NOMAN=		# defined
 
 .include <bsd.hostprog.mk>
diff --git a/games/canfield/cfscores/Makefile b/games/canfield/cfscores/Makefile
index f5205981dd73..312f1467d003 100644
--- a/games/canfield/cfscores/Makefile
+++ b/games/canfield/cfscores/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.5 1999/02/13 02:54:21 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2001/12/12 00:07:48 tv Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
-PROG=	cfscores
-CPPFLAGS+=-I${.CURDIR}/../canfield
-MKMAN=	no
-HIDEGAME=hidegame
+PROG=		cfscores
+CPPFLAGS+=	-I${.CURDIR}/../canfield
+NOMAN=		# defined
+HIDEGAME=	hidegame
 
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/games/fortune/unstr/Makefile b/games/fortune/unstr/Makefile
index e2a00a192cbb..628b1f1e66f2 100644
--- a/games/fortune/unstr/Makefile
+++ b/games/fortune/unstr/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.5 1999/02/13 02:54:21 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2001/12/12 00:07:48 tv Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=		unstr
-MKMAN=		no
+NOMAN=		# defined
 CPPFLAGS+=	-I${.CURDIR}/../strfile
 
 .include <bsd.prog.mk>
diff --git a/games/morse/Makefile b/games/morse/Makefile
index 967dda40a380..8a4e320cdd95 100644
--- a/games/morse/Makefile
+++ b/games/morse/Makefile
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.4 1999/02/13 02:54:21 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2001/12/12 00:07:48 tv Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
-PROG=	morse
-MKMAN=	no
-HIDEGAME=hidegame
+PROG=		morse
+NOMAN=		# defined
+HIDEGAME=	hidegame
 
 .include <bsd.prog.mk>
 
diff --git a/games/ppt/Makefile b/games/ppt/Makefile
index f551b0acf847..675b4d096383 100644
--- a/games/ppt/Makefile
+++ b/games/ppt/Makefile
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.4 1999/02/13 02:54:22 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2001/12/12 00:07:49 tv Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
-PROG=	ppt
-MKMAN=	no
-HIDEGAME=hidegame
+PROG=		ppt
+NOMAN=		# defined
+HIDEGAME=	hidegame
 
 .include <bsd.prog.mk>
 
diff --git a/games/primes/Makefile b/games/primes/Makefile
index 72627b8cfc2b..a8dd023d15f6 100644
--- a/games/primes/Makefile
+++ b/games/primes/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.4 1999/02/13 02:54:22 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2001/12/12 00:07:49 tv Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
-PROG=	primes
-SRCS=	pattern.c pr_tbl.c primes.c
-MKMAN=	no
-DPADD=	${LIBM}
-LDADD=	-lm
+PROG=		primes
+SRCS=		pattern.c pr_tbl.c primes.c
+NOMAN=		# defined
+DPADD=		${LIBM}
+LDADD=		-lm
 
 .include <bsd.prog.mk>
diff --git a/games/snake/snscore/Makefile b/games/snake/snscore/Makefile
index 6401dc3d12b5..37efef56a38c 100644
--- a/games/snake/snscore/Makefile
+++ b/games/snake/snscore/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.5 1999/02/13 02:54:22 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2001/12/12 00:07:49 tv Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
-PROG=	snscore
-CPPFLAGS+=-I${.CURDIR}/../snake
-MKMAN=	no
-HIDEGAME=hidegame
+PROG=		snscore
+CPPFLAGS+=	-I${.CURDIR}/../snake
+NOMAN=		# defined
+HIDEGAME=	hidegame
 
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/include/Makefile b/include/Makefile
index 37aba9956cac..9fc93e9029e4 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.98 2001/07/17 03:04:16 thorpej Exp $
+#	$NetBSD: Makefile,v 1.99 2001/12/12 00:07:50 tv Exp $
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
 
 # Doing a make includes builds /usr/include
@@ -27,11 +27,11 @@ INCS+=	rpcsvc/yp_prot.h rpcsvc/ypclnt.h
 INCS+=	ieeefp.h
 .endif
 
-INCSDIR=/usr/include
+INCSDIR=	/usr/include
 
-MKOBJ=	no
+NOOBJ=		# defined
 
-SUBDIR=	rpc
+SUBDIR=		rpc
 
 .include <bsd.prog.mk>
 .include <bsd.subdir.mk>