diff --git a/Makefile.inc1 b/Makefile.inc1
index d5f33e959d37..5bb9b1da9ed2 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -10,7 +10,7 @@
 #	-DNO_CRYPT will prevent building of crypt versions
 #	-DNO_MAN do not build the manual pages
 #	-DNO_PROFILE do not build profiled libraries
-#	-DNOGAMES do not go into games subdir
+#	-DNO_GAMES do not go into games subdir
 #	-DNOSHARE do not go into share subdir
 #	-DNO_INFO do not make or install info files
 #	-DNO_LIBC_R do not build libc_r.
@@ -45,7 +45,7 @@
 # We must do etc last for install/distribute to work.
 #
 SUBDIR=	share/info include lib libexec bin
-.if !defined(NOGAMES)
+.if !defined(NO_GAMES)
 SUBDIR+=games
 .endif
 SUBDIR+=gnu
@@ -798,7 +798,7 @@ legacy:
 #
 # bootstrap-tools: Build tools needed for compatibility
 #
-.if !defined(NOGAMES)
+.if !defined(NO_GAMES)
 _strfile=	games/fortune/strfile
 .endif
 
diff --git a/release/Makefile b/release/Makefile
index b33d8ed9a01c..4289affb592c 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -359,7 +359,7 @@ release rerelease:
 .endif
 	mkdir -p ${CHROOTDIR}
 	@echo ">>> make release for ${TARGET} started on `LC_ALL=C TZ=GMT date`"
-	cd ${WORLDDIR} && ${NATIVEMAKE} -DNOGAMES -DNOHTML -DNO_INFO -DNO_MAN \
+	cd ${WORLDDIR} && ${NATIVEMAKE} -DNO_GAMES -DNOHTML -DNO_INFO -DNO_MAN \
 	    -DNO_PROFILE installworld DESTDIR=${CHROOTDIR}
 	cd ${WORLDDIR}/etc && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR}
 	if [ -f /etc/resolv.conf ]; then \
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index 09daca76c1e1..14bf39a1c2dd 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -154,7 +154,7 @@ create_includes_and_libraries2() {
     MAKEOBJDIRPREFIX=${l_objtree}
     export MAKEOBJDIRPREFIX
     ( cd ${SRC};
-    make -DNOCLEAN -DNO_PROFILE -DNOGAMES -DNO_LIBC_R -DPICOBSD buildworld
+    make -DNOCLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R -DPICOBSD buildworld
     )
 }
 
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 827bc27c6f9f..298e45a2b597 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -115,7 +115,7 @@
 #NO_CXX=		# do not build C++ and friends
 #NO_DYNAMICROOT=	# do not link /bin and /sbin dynamically
 #NO_FORTRAN=		# do not build g77 and related libraries
-#NOGAMES=		# do not build games (games/ subdir)
+#NO_GAMES=		# do not build games (games/ subdir)
 #NO_GDB=		# do not build GDB
 #NO_I4B=		# do not build isdn4bsd package
 #NOINET6=		# do not build IPv6 related programs and libraries
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 04afb73572c0..f890524c63e8 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -538,7 +538,7 @@ instead of
 .It Va NO_CRYPT
 .Pq Vt bool
 Set to not build any crypto code.
-.It Va NOGAMES
+.It Va NO_GAMES
 .Pq Vt bool
 Set to not build games.
 .It Va NO_INFO
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index 80fc0627befb..fc1726ffa9ce 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -7,6 +7,7 @@
 	NODOCCOMPRESS:NO_DOCCOMPRESS \
 	NOEXTRADEPEND:NO_EXTRADEPEND \
 	NOFSCHG:NO_FSCHG \
+	NOGAMES:NO_GAMES \
 	NOINFO:NO_INFO \
 	NOINFOCOMPRESS:NO_INFOCOMPRESS \
 	NOINSTALLLIB:NO_INSTALLLIB \
diff --git a/tools/tools/nanobsd/make.conf b/tools/tools/nanobsd/make.conf
index 0a47e39ce73d..6e29d398b49a 100644
--- a/tools/tools/nanobsd/make.conf
+++ b/tools/tools/nanobsd/make.conf
@@ -14,7 +14,7 @@ NO_BLUETOOTH=
 NO_CVS=
 NO_CXX=
 NO_FORTRAN=
-NOGAMES=
+NO_GAMES=
 NO_GCOV=
 NO_GDB=
 NO_HESIOD_LIBC=