diff --git a/commands/Makefile b/commands/Makefile
index 61b67c101..64041e296 100644
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -16,7 +16,7 @@ SUBDIR=	aal add_route adduser advent arp ash at autil awk \
 	hostaddr id ifconfig ifdef indent install \
 	intr ipcrm ipcs irdpd isoread join kill last leave \
 	less lex life loadkeys loadramdisk logger login look lp \
-	lpd ls lspci M m4 mail make MAKEDEV man \
+	lpd ls lspci M m4 mail make makewhatis MAKEDEV man \
 	mdb mdocml mesg mined mkdep mkdir mkdist mkfifo mkfs mknod \
 	mkproto modem mount mt netconf newroot nice nm nohup \
 	nonamed od packit packman passwd paste patch pax \
@@ -31,7 +31,7 @@ SUBDIR=	aal add_route adduser advent arp ash at autil awk \
 	telnetd term termcap tget time tinyhalt top touch tr \
 	truncate tsort ttt tty udpstat umount uname unexpand \
 	uniq unstack update urlget uud uue version vol wc \
-	whereis which who whoami write writeisofs \
+	whereis which who write writeisofs \
 	xargs yacc yes zdump zic zmodem
 
 .if ${ARCH} == "i386"
diff --git a/commands/whoami/Makefile b/commands/whoami/Makefile
deleted file mode 100644
index a53e128ee..000000000
--- a/commands/whoami/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-PROG=	whoami
-MAN=
-
-.include <bsd.prog.mk>
diff --git a/commands/whoami/whoami.c b/commands/whoami/whoami.c
deleted file mode 100644
index 99ec440cb..000000000
--- a/commands/whoami/whoami.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* whoami - print the current user name 	Author: Terrence W. Holm */
-
-#include <sys/types.h>
-#include <pwd.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-
-_PROTOTYPE(int main, (void));
-
-int main()
-{
-  struct passwd *pw_entry;
-
-  pw_entry = getpwuid(geteuid());
-  if (pw_entry == NULL) exit(1);
-  puts(pw_entry->pw_name);
-  return(0);
-}