diff --git a/Makefile.inc1 b/Makefile.inc1
index 24f466cdc9bf..389950cdf046 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -61,9 +61,6 @@ SUBDIR=	${SUBDIR_OVERRIDE}
 .else
 SUBDIR=	lib libexec
 SUBDIR+=bin
-.if ${MK_GAMES} != "no"
-SUBDIR+=games
-.endif
 .if ${MK_CDDL} != "no"
 SUBDIR+=cddl
 .endif
@@ -1285,7 +1282,7 @@ legacy:
 _bt=		_bootstrap-tools
 
 .if ${MK_GAMES} != "no"
-_strfile=	games/fortune/strfile
+_strfile=	usr.bin/fortune/strfile
 .endif
 
 .if ${MK_GCC} != "no" && ${MK_CXX} != "no"
diff --git a/games/Makefile b/games/Makefile
deleted file mode 100644
index 4a3da52136ba..000000000000
--- a/games/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-SUBDIR= \
-	caesar \
-	factor \
-	fortune \
-	grdc \
-	morse \
-	number \
-	pom \
-	primes \
-	random \
-	${_tests}
-
-.if ${MK_TESTS} != "no"
-_tests=	tests
-.endif
-
-.include <bsd.subdir.mk>
diff --git a/games/Makefile.inc b/games/Makefile.inc
deleted file mode 100644
index 40525f8d061c..000000000000
--- a/games/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
-
-BINDIR?=	/usr/bin
-FILESDIR?=	${SHAREDIR}/games
-WARNS?=		6
diff --git a/games/tests/Makefile b/games/tests/Makefile
deleted file mode 100644
index 45f93d9343bb..000000000000
--- a/games/tests/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/games
-
-.PATH:		${.CURDIR:H:H}/tests
-KYUAFILE=	yes
-
-.include <bsd.test.mk>
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index faabe6714bce..4f8a36b9cfe2 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -230,6 +230,18 @@ SUBDIR+=	finger
 SUBDIR+=	ftp
 .endif
 
+.if ${MK_GAMES} != "no"
+SUBDIR+=	caesar
+SUBDIR+=	factor
+SUBDIR+=	fortune
+SUBDIR+=	grdc
+SUBDIR+=	morse
+SUBDIR+=	number
+SUBDIR+=	pom
+SUBDIR+=	primes
+SUBDIR+=	random
+.endif
+
 .if ${MK_GPL_DTC} != "yes"
 SUBDIR+=	dtc
 .endif
diff --git a/games/caesar/Makefile b/usr.bin/caesar/Makefile
similarity index 100%
rename from games/caesar/Makefile
rename to usr.bin/caesar/Makefile
diff --git a/games/caesar/Makefile.depend b/usr.bin/caesar/Makefile.depend
similarity index 100%
rename from games/caesar/Makefile.depend
rename to usr.bin/caesar/Makefile.depend
diff --git a/games/caesar/caesar.6 b/usr.bin/caesar/caesar.6
similarity index 100%
rename from games/caesar/caesar.6
rename to usr.bin/caesar/caesar.6
diff --git a/games/caesar/caesar.c b/usr.bin/caesar/caesar.c
similarity index 100%
rename from games/caesar/caesar.c
rename to usr.bin/caesar/caesar.c
diff --git a/games/caesar/rot13.sh b/usr.bin/caesar/rot13.sh
similarity index 100%
rename from games/caesar/rot13.sh
rename to usr.bin/caesar/rot13.sh
diff --git a/games/factor/Makefile b/usr.bin/factor/Makefile
similarity index 100%
rename from games/factor/Makefile
rename to usr.bin/factor/Makefile
diff --git a/games/factor/Makefile.depend b/usr.bin/factor/Makefile.depend
similarity index 100%
rename from games/factor/Makefile.depend
rename to usr.bin/factor/Makefile.depend
diff --git a/games/factor/factor.6 b/usr.bin/factor/factor.6
similarity index 100%
rename from games/factor/factor.6
rename to usr.bin/factor/factor.6
diff --git a/games/factor/factor.c b/usr.bin/factor/factor.c
similarity index 100%
rename from games/factor/factor.c
rename to usr.bin/factor/factor.c
diff --git a/games/fortune/Makefile b/usr.bin/fortune/Makefile
similarity index 100%
rename from games/fortune/Makefile
rename to usr.bin/fortune/Makefile
diff --git a/games/fortune/Makefile.inc b/usr.bin/fortune/Makefile.inc
similarity index 100%
rename from games/fortune/Makefile.inc
rename to usr.bin/fortune/Makefile.inc
diff --git a/games/fortune/Notes b/usr.bin/fortune/Notes
similarity index 100%
rename from games/fortune/Notes
rename to usr.bin/fortune/Notes
diff --git a/games/fortune/README b/usr.bin/fortune/README
similarity index 100%
rename from games/fortune/README
rename to usr.bin/fortune/README
diff --git a/games/fortune/datfiles/Makefile b/usr.bin/fortune/datfiles/Makefile
similarity index 100%
rename from games/fortune/datfiles/Makefile
rename to usr.bin/fortune/datfiles/Makefile
diff --git a/games/fortune/datfiles/Makefile.depend b/usr.bin/fortune/datfiles/Makefile.depend
similarity index 100%
rename from games/fortune/datfiles/Makefile.depend
rename to usr.bin/fortune/datfiles/Makefile.depend
diff --git a/games/fortune/datfiles/fortunes b/usr.bin/fortune/datfiles/fortunes
similarity index 100%
rename from games/fortune/datfiles/fortunes
rename to usr.bin/fortune/datfiles/fortunes
diff --git a/games/fortune/datfiles/fortunes.sp.ok b/usr.bin/fortune/datfiles/fortunes.sp.ok
similarity index 100%
rename from games/fortune/datfiles/fortunes.sp.ok
rename to usr.bin/fortune/datfiles/fortunes.sp.ok
diff --git a/games/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips
similarity index 100%
rename from games/fortune/datfiles/freebsd-tips
rename to usr.bin/fortune/datfiles/freebsd-tips
diff --git a/games/fortune/datfiles/freebsd-tips.sp.ok b/usr.bin/fortune/datfiles/freebsd-tips.sp.ok
similarity index 100%
rename from games/fortune/datfiles/freebsd-tips.sp.ok
rename to usr.bin/fortune/datfiles/freebsd-tips.sp.ok
diff --git a/games/fortune/datfiles/gerrold.limerick b/usr.bin/fortune/datfiles/gerrold.limerick
similarity index 100%
rename from games/fortune/datfiles/gerrold.limerick
rename to usr.bin/fortune/datfiles/gerrold.limerick
diff --git a/games/fortune/datfiles/limerick b/usr.bin/fortune/datfiles/limerick
similarity index 100%
rename from games/fortune/datfiles/limerick
rename to usr.bin/fortune/datfiles/limerick
diff --git a/games/fortune/datfiles/limerick.sp.ok b/usr.bin/fortune/datfiles/limerick.sp.ok
similarity index 100%
rename from games/fortune/datfiles/limerick.sp.ok
rename to usr.bin/fortune/datfiles/limerick.sp.ok
diff --git a/games/fortune/datfiles/murphy b/usr.bin/fortune/datfiles/murphy
similarity index 100%
rename from games/fortune/datfiles/murphy
rename to usr.bin/fortune/datfiles/murphy
diff --git a/games/fortune/datfiles/murphy-o b/usr.bin/fortune/datfiles/murphy-o
similarity index 100%
rename from games/fortune/datfiles/murphy-o
rename to usr.bin/fortune/datfiles/murphy-o
diff --git a/games/fortune/datfiles/murphy.sp.ok b/usr.bin/fortune/datfiles/murphy.sp.ok
similarity index 100%
rename from games/fortune/datfiles/murphy.sp.ok
rename to usr.bin/fortune/datfiles/murphy.sp.ok
diff --git a/games/fortune/datfiles/startrek b/usr.bin/fortune/datfiles/startrek
similarity index 100%
rename from games/fortune/datfiles/startrek
rename to usr.bin/fortune/datfiles/startrek
diff --git a/games/fortune/datfiles/startrek.sp.ok b/usr.bin/fortune/datfiles/startrek.sp.ok
similarity index 100%
rename from games/fortune/datfiles/startrek.sp.ok
rename to usr.bin/fortune/datfiles/startrek.sp.ok
diff --git a/games/fortune/datfiles/zippy b/usr.bin/fortune/datfiles/zippy
similarity index 100%
rename from games/fortune/datfiles/zippy
rename to usr.bin/fortune/datfiles/zippy
diff --git a/games/fortune/datfiles/zippy.sp.ok b/usr.bin/fortune/datfiles/zippy.sp.ok
similarity index 100%
rename from games/fortune/datfiles/zippy.sp.ok
rename to usr.bin/fortune/datfiles/zippy.sp.ok
diff --git a/games/fortune/fortune/Makefile b/usr.bin/fortune/fortune/Makefile
similarity index 100%
rename from games/fortune/fortune/Makefile
rename to usr.bin/fortune/fortune/Makefile
diff --git a/games/fortune/fortune/Makefile.depend b/usr.bin/fortune/fortune/Makefile.depend
similarity index 100%
rename from games/fortune/fortune/Makefile.depend
rename to usr.bin/fortune/fortune/Makefile.depend
diff --git a/games/fortune/fortune/fortune.6 b/usr.bin/fortune/fortune/fortune.6
similarity index 100%
rename from games/fortune/fortune/fortune.6
rename to usr.bin/fortune/fortune/fortune.6
diff --git a/games/fortune/fortune/fortune.c b/usr.bin/fortune/fortune/fortune.c
similarity index 100%
rename from games/fortune/fortune/fortune.c
rename to usr.bin/fortune/fortune/fortune.c
diff --git a/games/fortune/fortune/pathnames.h b/usr.bin/fortune/fortune/pathnames.h
similarity index 100%
rename from games/fortune/fortune/pathnames.h
rename to usr.bin/fortune/fortune/pathnames.h
diff --git a/games/fortune/strfile/Makefile b/usr.bin/fortune/strfile/Makefile
similarity index 100%
rename from games/fortune/strfile/Makefile
rename to usr.bin/fortune/strfile/Makefile
diff --git a/games/fortune/strfile/Makefile.depend b/usr.bin/fortune/strfile/Makefile.depend
similarity index 100%
rename from games/fortune/strfile/Makefile.depend
rename to usr.bin/fortune/strfile/Makefile.depend
diff --git a/games/fortune/strfile/strfile.8 b/usr.bin/fortune/strfile/strfile.8
similarity index 100%
rename from games/fortune/strfile/strfile.8
rename to usr.bin/fortune/strfile/strfile.8
diff --git a/games/fortune/strfile/strfile.c b/usr.bin/fortune/strfile/strfile.c
similarity index 100%
rename from games/fortune/strfile/strfile.c
rename to usr.bin/fortune/strfile/strfile.c
diff --git a/games/fortune/strfile/strfile.h b/usr.bin/fortune/strfile/strfile.h
similarity index 100%
rename from games/fortune/strfile/strfile.h
rename to usr.bin/fortune/strfile/strfile.h
diff --git a/games/fortune/tools/Do_spell b/usr.bin/fortune/tools/Do_spell
similarity index 100%
rename from games/fortune/tools/Do_spell
rename to usr.bin/fortune/tools/Do_spell
diff --git a/games/fortune/tools/Do_troff b/usr.bin/fortune/tools/Do_troff
similarity index 100%
rename from games/fortune/tools/Do_troff
rename to usr.bin/fortune/tools/Do_troff
diff --git a/games/fortune/tools/Troff.mac b/usr.bin/fortune/tools/Troff.mac
similarity index 100%
rename from games/fortune/tools/Troff.mac
rename to usr.bin/fortune/tools/Troff.mac
diff --git a/games/fortune/tools/Troff.sed b/usr.bin/fortune/tools/Troff.sed
similarity index 100%
rename from games/fortune/tools/Troff.sed
rename to usr.bin/fortune/tools/Troff.sed
diff --git a/games/fortune/tools/do_sort b/usr.bin/fortune/tools/do_sort
similarity index 100%
rename from games/fortune/tools/do_sort
rename to usr.bin/fortune/tools/do_sort
diff --git a/games/fortune/tools/do_uniq.py b/usr.bin/fortune/tools/do_uniq.py
similarity index 100%
rename from games/fortune/tools/do_uniq.py
rename to usr.bin/fortune/tools/do_uniq.py
diff --git a/games/fortune/unstr/Makefile b/usr.bin/fortune/unstr/Makefile
similarity index 100%
rename from games/fortune/unstr/Makefile
rename to usr.bin/fortune/unstr/Makefile
diff --git a/games/fortune/unstr/Makefile.depend b/usr.bin/fortune/unstr/Makefile.depend
similarity index 100%
rename from games/fortune/unstr/Makefile.depend
rename to usr.bin/fortune/unstr/Makefile.depend
diff --git a/games/fortune/unstr/unstr.c b/usr.bin/fortune/unstr/unstr.c
similarity index 100%
rename from games/fortune/unstr/unstr.c
rename to usr.bin/fortune/unstr/unstr.c
diff --git a/games/grdc/Makefile b/usr.bin/grdc/Makefile
similarity index 100%
rename from games/grdc/Makefile
rename to usr.bin/grdc/Makefile
diff --git a/games/grdc/Makefile.depend b/usr.bin/grdc/Makefile.depend
similarity index 100%
rename from games/grdc/Makefile.depend
rename to usr.bin/grdc/Makefile.depend
diff --git a/games/grdc/grdc.6 b/usr.bin/grdc/grdc.6
similarity index 100%
rename from games/grdc/grdc.6
rename to usr.bin/grdc/grdc.6
diff --git a/games/grdc/grdc.c b/usr.bin/grdc/grdc.c
similarity index 100%
rename from games/grdc/grdc.c
rename to usr.bin/grdc/grdc.c
diff --git a/games/morse/Makefile b/usr.bin/morse/Makefile
similarity index 100%
rename from games/morse/Makefile
rename to usr.bin/morse/Makefile
diff --git a/games/morse/Makefile.depend b/usr.bin/morse/Makefile.depend
similarity index 100%
rename from games/morse/Makefile.depend
rename to usr.bin/morse/Makefile.depend
diff --git a/games/morse/morse.6 b/usr.bin/morse/morse.6
similarity index 100%
rename from games/morse/morse.6
rename to usr.bin/morse/morse.6
diff --git a/games/morse/morse.c b/usr.bin/morse/morse.c
similarity index 100%
rename from games/morse/morse.c
rename to usr.bin/morse/morse.c
diff --git a/games/number/Makefile b/usr.bin/number/Makefile
similarity index 100%
rename from games/number/Makefile
rename to usr.bin/number/Makefile
diff --git a/games/number/Makefile.depend b/usr.bin/number/Makefile.depend
similarity index 100%
rename from games/number/Makefile.depend
rename to usr.bin/number/Makefile.depend
diff --git a/games/number/number.6 b/usr.bin/number/number.6
similarity index 100%
rename from games/number/number.6
rename to usr.bin/number/number.6
diff --git a/games/number/number.c b/usr.bin/number/number.c
similarity index 100%
rename from games/number/number.c
rename to usr.bin/number/number.c
diff --git a/games/pom/Makefile b/usr.bin/pom/Makefile
similarity index 100%
rename from games/pom/Makefile
rename to usr.bin/pom/Makefile
diff --git a/games/pom/Makefile.depend b/usr.bin/pom/Makefile.depend
similarity index 100%
rename from games/pom/Makefile.depend
rename to usr.bin/pom/Makefile.depend
diff --git a/games/pom/pom.6 b/usr.bin/pom/pom.6
similarity index 100%
rename from games/pom/pom.6
rename to usr.bin/pom/pom.6
diff --git a/games/pom/pom.c b/usr.bin/pom/pom.c
similarity index 100%
rename from games/pom/pom.c
rename to usr.bin/pom/pom.c
diff --git a/games/primes/Makefile b/usr.bin/primes/Makefile
similarity index 100%
rename from games/primes/Makefile
rename to usr.bin/primes/Makefile
diff --git a/games/primes/Makefile.depend b/usr.bin/primes/Makefile.depend
similarity index 100%
rename from games/primes/Makefile.depend
rename to usr.bin/primes/Makefile.depend
diff --git a/games/primes/pattern.c b/usr.bin/primes/pattern.c
similarity index 100%
rename from games/primes/pattern.c
rename to usr.bin/primes/pattern.c
diff --git a/games/primes/pr_tbl.c b/usr.bin/primes/pr_tbl.c
similarity index 100%
rename from games/primes/pr_tbl.c
rename to usr.bin/primes/pr_tbl.c
diff --git a/games/primes/primes.c b/usr.bin/primes/primes.c
similarity index 100%
rename from games/primes/primes.c
rename to usr.bin/primes/primes.c
diff --git a/games/primes/primes.h b/usr.bin/primes/primes.h
similarity index 100%
rename from games/primes/primes.h
rename to usr.bin/primes/primes.h
diff --git a/games/primes/spsp.c b/usr.bin/primes/spsp.c
similarity index 100%
rename from games/primes/spsp.c
rename to usr.bin/primes/spsp.c
diff --git a/games/random/Makefile b/usr.bin/random/Makefile
similarity index 100%
rename from games/random/Makefile
rename to usr.bin/random/Makefile
diff --git a/games/random/Makefile.depend b/usr.bin/random/Makefile.depend
similarity index 100%
rename from games/random/Makefile.depend
rename to usr.bin/random/Makefile.depend
diff --git a/games/random/random.6 b/usr.bin/random/random.6
similarity index 100%
rename from games/random/random.6
rename to usr.bin/random/random.6
diff --git a/games/random/random.c b/usr.bin/random/random.c
similarity index 100%
rename from games/random/random.c
rename to usr.bin/random/random.c
diff --git a/games/random/randomize_fd.c b/usr.bin/random/randomize_fd.c
similarity index 100%
rename from games/random/randomize_fd.c
rename to usr.bin/random/randomize_fd.c
diff --git a/games/random/randomize_fd.h b/usr.bin/random/randomize_fd.h
similarity index 100%
rename from games/random/randomize_fd.h
rename to usr.bin/random/randomize_fd.h