diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index fc6b94adf4c..cd0e6730d56 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -177,6 +177,7 @@ SUBDIR=	alias \
 	w \
 	wall \
 	wc \
+	wg \
 	what \
 	whereis \
 	which \
diff --git a/usr.bin/wg/Makefile b/usr.bin/wg/Makefile
new file mode 100644
index 00000000000..55cf5fccf53
--- /dev/null
+++ b/usr.bin/wg/Makefile
@@ -0,0 +1,41 @@
+
+PROG=	wg
+MAN=	wg.8
+
+LIBADD=	nv
+
+.PATH: ${SRCTOP}/contrib/wireguard-tools
+.PATH: ${SRCTOP}/contrib/wireguard-tools/man
+
+SRCS+=	wg.c
+
+SRCS+=	config.c
+SRCS+=	encoding.c
+SRCS+=	ipc.c
+SRCS+=	terminal.c
+
+SRCS+=	curve25519.c
+
+# Subcommands
+SRCS+=	show.c
+SRCS+=	showconf.c
+SRCS+=	set.c
+SRCS+=	setconf.c
+SRCS+=	genkey.c
+SRCS+=	pubkey.c
+
+# Base should pull RUNSTATEDIR from paths.h, _PATH_VARRUN
+CFLAGS+=	-include paths.h
+CFLAGS+=	-DRUNSTATEDIR="_PATH_VARRUN"
+
+# Not going to change this one.
+CWARNFLAGS.curve25519.c+=	-Wno-shadow
+
+# sockaddr{,_in} alignment
+CWARNFLAGS.config.c+=	-Wno-cast-align
+CWARNFLAGS.ipc.c+=	-Wno-cast-align
+
+# qsort comparator
+CWARNFLAGS.show.c+=	-Wno-cast-qual
+
+.include <bsd.prog.mk>