Index: sbin/md5/Makefile
===================================================================
--- sbin/md5/Makefile
+++ sbin/md5/Makefile
@@ -4,27 +4,47 @@
 PACKAGE=runtime
 PROG=	md5
 
-LINKS=	${BINDIR}/md5 ${BINDIR}/rmd160 \
+LINKS=	${BINDIR}/md5 ${BINDIR}/md5sum \
+	${BINDIR}/md5 ${BINDIR}/rmd160 \
+	${BINDIR}/md5 ${BINDIR}/rmd160sum \
 	${BINDIR}/md5 ${BINDIR}/sha1 \
 	${BINDIR}/md5 ${BINDIR}/sha224 \
+	${BINDIR}/md5 ${BINDIR}/sha224sum \
 	${BINDIR}/md5 ${BINDIR}/sha256 \
+	${BINDIR}/md5 ${BINDIR}/sha256sum \
 	${BINDIR}/md5 ${BINDIR}/sha384 \
+	${BINDIR}/md5 ${BINDIR}/sha384sum \
 	${BINDIR}/md5 ${BINDIR}/sha512 \
+	${BINDIR}/md5 ${BINDIR}/sha512sum \
 	${BINDIR}/md5 ${BINDIR}/sha512t256 \
+	${BINDIR}/md5 ${BINDIR}/sha512t256sum \
 	${BINDIR}/md5 ${BINDIR}/skein256 \
+	${BINDIR}/md5 ${BINDIR}/skein256sum \
 	${BINDIR}/md5 ${BINDIR}/skein512 \
-	${BINDIR}/md5 ${BINDIR}/skein1024
+	${BINDIR}/md5 ${BINDIR}/skein512sum \
+	${BINDIR}/md5 ${BINDIR}/skein1024 \
+	${BINDIR}/md5 ${BINDIR}/skein1024sum
 
-MLINKS=	md5.1 rmd160.1 \
+MLINKS=	md5.1 md5sum.1 \
+	md5.1 rmd160.1 \
+	md5.1 rmd160sum.1 \
 	md5.1 sha1.1 \
 	md5.1 sha224.1 \
+	md5.1 sha224sum.1 \
 	md5.1 sha256.1 \
+	md5.1 sha256sum.1 \
 	md5.1 sha384.1 \
+	md5.1 sha384sum.1 \
 	md5.1 sha512.1 \
+	md5.1 sha512sum.1 \
 	md5.1 sha512t256.1 \
+	md5.1 sha512t256sum.1 \
 	md5.1 skein256.1 \
+	md5.1 skein256sum.1 \
 	md5.1 skein512.1 \
-	md5.1 skein1024.1
+	md5.1 skein512sum.1 \
+	md5.1 skein1024.1 \
+	md5.1 skein1024sum.1
 
 LIBADD=	md
 
Index: sbin/md5/md5.c
===================================================================
--- sbin/md5/md5.c
+++ sbin/md5/md5.c
@@ -177,13 +177,19 @@
 	char	buf[HEX_DIGEST_LENGTH];
 	size_t	len;
  	unsigned	digest;
- 	const char*	progname;
+ 	char	*progname;
 
  	if ((progname = strrchr(argv[0], '/')) == NULL)
  		progname = argv[0];
  	else
  		progname++;
 
+	len = strlen(progname);
+	if (len > 3 && strcmp(progname + len - 3, "sum") == 0) {
+		progname[len - 3] = '\0';
+		rflag = 1;
+	}
+
  	for (digest = 0; digest < sizeof(Algorithm)/sizeof(*Algorithm); digest++)
  		if (strcasecmp(Algorithm[digest].progname, progname) == 0)
  			break;