diff --git a/net/Makefile b/net/Makefile
index 7cd605c77be4..9043af582e6d 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1477,6 +1477,7 @@
     SUBDIR += tshark
     SUBDIR += tshark-lite
     SUBDIR += tsocks
+    SUBDIR += tunneller
     SUBDIR += turnserver
     SUBDIR += twitux
     SUBDIR += u6rd
diff --git a/net/tunneller/Makefile b/net/tunneller/Makefile
new file mode 100644
index 000000000000..9d98cf8d571d
--- /dev/null
+++ b/net/tunneller/Makefile
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+PORTNAME=	tunneller
+DISTVERSIONPREFIX=	release-
+DISTVERSION=	0.6
+CATEGORIES=	net
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Expose internal services to be accessed over the internet
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:modules
+USE_GITHUB=	yes
+GH_ACCOUNT=	skx
+GH_TUPLE=	\
+		cjbassi:drawille-go:27dc511fe6fd:cjbassi_drawille_go/vendor/github.com/cjbassi/drawille-go \
+		eclipse:paho.mqtt.golang:v1.2.0:eclipse_paho_mqtt_golang/vendor/github.com/eclipse/paho.mqtt.golang \
+		gizak:termui:v3.0.0:gizak_termui/vendor/github.com/gizak/termui/v3 \
+		golang:net:afe8014c977f:golang_net/vendor/golang.org/x/net \
+		google:subcommands:v1.0.1:google_subcommands/vendor/github.com/google/subcommands \
+		mattn:go-runewidth:v0.0.2:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+		mitchellh:go-wordwrap:ad45545899c7:mitchellh_go_wordwrap/vendor/github.com/mitchellh/go-wordwrap \
+		nsf:termbox-go:02980233997d:nsf_termbox_go/vendor/github.com/nsf/termbox-go \
+		satori:go.uuid:v1.2.0:satori_go_uuid/vendor/github.com/satori/go.uuid
+
+PLIST_FILES=	bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/net/tunneller/distinfo b/net/tunneller/distinfo
new file mode 100644
index 000000000000..ef767329c630
--- /dev/null
+++ b/net/tunneller/distinfo
@@ -0,0 +1,21 @@
+TIMESTAMP = 1582412200
+SHA256 (skx-tunneller-release-0.6_GH0.tar.gz) = 961a02d5485a48d134d1d5297250571ac7f94b01c28395fb6e801e3656138c76
+SIZE (skx-tunneller-release-0.6_GH0.tar.gz) = 67059
+SHA256 (cjbassi-drawille-go-27dc511fe6fd_GH0.tar.gz) = a9e06c0d5335e10010e71d81415f65c69d8f4c2e9f7b26c8d3a84dee49a2b6ae
+SIZE (cjbassi-drawille-go-27dc511fe6fd_GH0.tar.gz) = 1708
+SHA256 (eclipse-paho.mqtt.golang-v1.2.0_GH0.tar.gz) = c822d615958cd3df6a42e1b549dc1a6791b1078ad71880eae06b8cd16e2ab744
+SIZE (eclipse-paho.mqtt.golang-v1.2.0_GH0.tar.gz) = 71857
+SHA256 (gizak-termui-v3.0.0_GH0.tar.gz) = a1df0d378b813be620f4b593c1b98056ce0091ec6a830e765dec7cf645a248b4
+SIZE (gizak-termui-v3.0.0_GH0.tar.gz) = 184064
+SHA256 (golang-net-afe8014c977f_GH0.tar.gz) = d8605c8e64fff7df10dc526406afc73ffcf1c772f5789c861df205feb5205e10
+SIZE (golang-net-afe8014c977f_GH0.tar.gz) = 978644
+SHA256 (google-subcommands-v1.0.1_GH0.tar.gz) = 7ddd3eac82240ce08b75f9b03ff50483e121329517d9c20570207aaddfeff14f
+SIZE (google-subcommands-v1.0.1_GH0.tar.gz) = 8927
+SHA256 (mattn-go-runewidth-v0.0.2_GH0.tar.gz) = 6c7734401fdf829af4f35a5af21a54548f7d3a68336940fb550178ddfe95b076
+SIZE (mattn-go-runewidth-v0.0.2_GH0.tar.gz) = 22367
+SHA256 (mitchellh-go-wordwrap-ad45545899c7_GH0.tar.gz) = 917005b52e496fda7f702a88fb65a90cc5f2c8d5a569cf39aeaf1b536dd582d9
+SIZE (mitchellh-go-wordwrap-ad45545899c7_GH0.tar.gz) = 2740
+SHA256 (nsf-termbox-go-02980233997d_GH0.tar.gz) = 454576132767864baa6bf84a81836ed6dc0e18d6dd20561cf8bf9127b13f427b
+SIZE (nsf-termbox-go-02980233997d_GH0.tar.gz) = 31954
+SHA256 (satori-go.uuid-v1.2.0_GH0.tar.gz) = 6f9d9549958252d7c5a5ed1cabeedeaab7a600ca0b888a3666cce4c3590aa5a7
+SIZE (satori-go.uuid-v1.2.0_GH0.tar.gz) = 8297
diff --git a/net/tunneller/pkg-descr b/net/tunneller/pkg-descr
new file mode 100644
index 000000000000..443802180586
--- /dev/null
+++ b/net/tunneller/pkg-descr
@@ -0,0 +1,7 @@
+Tunneller allows you to expose services which are running on localhost, or on
+your local network, to the public internet.
+
+This is very useful for testing webhooks, the generation of static-site
+compilers, and similar things.
+
+WWW: https://github.com/skx/tunneller