diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index d23ea177bee7..87f6297b635f 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -7,7 +7,8 @@
 # XXX Use GNU versions: apropos bc dc diff grep ld man patch whatis
 # Moved to secure: bdes
 #
-SUBDIR=	apply \
+SUBDIR=	alias \
+	apply \
 	asa \
 	at \
 	awk \
@@ -20,7 +21,6 @@ SUBDIR=	apply \
 	calendar \
 	cap_mkdb \
 	catman \
-	cd \
 	chat \
 	checknr \
 	chflags \
@@ -33,7 +33,6 @@ SUBDIR=	apply \
 	colrm \
 	column \
 	comm \
-	command \
 	compile_et \
 	compress \
 	csplit \
diff --git a/usr.bin/alias/Makefile b/usr.bin/alias/Makefile
new file mode 100644
index 000000000000..c4f8748e25cb
--- /dev/null
+++ b/usr.bin/alias/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+SCRIPTS=generic.sh
+SCRIPTSNAME=cd
+NOMAN=
+
+LINKS=	${BINDIR}/alias ${BINDIR}/bg \
+	${BINDIR}/alias ${BINDIR}/cd \
+	${BINDIR}/alias ${BINDIR}/command \
+	${BINDIR}/alias ${BINDIR}/fc \
+	${BINDIR}/alias ${BINDIR}/fg \
+	${BINDIR}/alias ${BINDIR}/getopts \
+	${BINDIR}/alias ${BINDIR}/jobs \
+	${BINDIR}/alias ${BINDIR}/read \
+	${BINDIR}/alias ${BINDIR}/umask \
+	${BINDIR}/alias ${BINDIR}/unalias \
+	${BINDIR}/alias ${BINDIR}/wait
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/cd/cd.sh b/usr.bin/alias/generic.sh
similarity index 75%
rename from usr.bin/cd/cd.sh
rename to usr.bin/alias/generic.sh
index 2330f56639de..33a39ad97831 100644
--- a/usr.bin/cd/cd.sh
+++ b/usr.bin/alias/generic.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 # $FreeBSD$
 # This file is in the public domain.
-cd ${1+"$@"}
+${0##*/} ${1+"$@"}
diff --git a/usr.bin/cd/Makefile b/usr.bin/cd/Makefile
deleted file mode 100644
index 5388f5efc241..000000000000
--- a/usr.bin/cd/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-SCRIPTS=cd.sh
-NOMAN=
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/command/Makefile b/usr.bin/command/Makefile
deleted file mode 100644
index e27201f7e4c0..000000000000
--- a/usr.bin/command/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-SCRIPTS=command.sh
-NOMAN=
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/command/command.sh b/usr.bin/command/command.sh
deleted file mode 100644
index 74d585b1eb9c..000000000000
--- a/usr.bin/command/command.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-# This file is in the public domain.
-command ${1+"$@"}