diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile
index caadc3bd063b..e40f46c1acdf 100644
--- a/usr.bin/uudecode/Makefile
+++ b/usr.bin/uudecode/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	uudecode
 WARNS?=	4
+LINKS=	${BINDIR}/uudecode ${BINDIR}/b64decode
 NOMAN=	noman
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile
index 7741e5ed6c15..0dcb9a18ce97 100644
--- a/usr.bin/uuencode/Makefile
+++ b/usr.bin/uuencode/Makefile
@@ -4,7 +4,10 @@
 PROG=	uuencode
 WARNS?=	4
 MAN=	uuencode.1 uuencode.format.5
+LINKS=	${BINDIR}/uuencode ${BINDIR}/b64encode
 MLINKS=	uuencode.1 uudecode.1 \
-	uuencode.format.5 uuencode.5
+	uuencode.format.5 uuencode.5 \
+	uuencode.1 b64encode.1 \
+	b64decode.1 b64encode.1
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index c254ec215a5e..c26e2c3a181d 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -37,7 +37,9 @@
 .Os
 .Sh NAME
 .Nm uuencode ,
-.Nm uudecode
+.Nm uudecode ,
+.Nm b64encode ,
+.Nm b64decode
 .Nd encode/decode a binary file
 .Sh SYNOPSIS
 .Nm
@@ -51,6 +53,13 @@
 .Nm uudecode
 .Op Fl i
 .Fl o Ar output_file
+.Nm b64encode
+.Op Fl o Ar output_file
+.Op Ar file
+.Ar name
+.Nm b64decode
+.Op Fl i
+.Fl o Ar output_file
 .Op Ar file
 .Sh DESCRIPTION
 The
@@ -61,6 +70,17 @@ utilities are used to transmit binary files over transmission mediums
 that do not support other than simple
 .Tn ASCII
 data.
+The
+.Nm b64encode
+utility is synonymous with
+.Nm
+with the
+.Fl m
+flag specified.
+The
+.Nm b64decode
+utility is synonymous with
+.Nm uudecode .
 .Pp
 The
 .Nm
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index e50c94cf71ef..1e6c6530fc65 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -83,6 +83,9 @@ main(int argc, char *argv[])
 	base64 = 0;
 	outfile = NULL;
 
+	if (strcmp(argv[0], "b64encode") == 0)
+		base64 = 1;
+
 	while ((ch = getopt(argc, argv, "mo:")) != -1) {
 		switch (ch) {
 		case 'm':