diff --git a/dns/getdns/Makefile b/dns/getdns/Makefile
index fa3efdb27c10..caa51ceb2d22 100644
--- a/dns/getdns/Makefile
+++ b/dns/getdns/Makefile
@@ -3,10 +3,11 @@
 
 PORTNAME=	getdns
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://getdnsapi.net/dist/ \
 		ZI \
-		http://getdnsapi.net/dist/ \
+		http://getdnsapi.net/dist/
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Modern asynchronous DNS API
@@ -32,11 +33,12 @@ PLIST_SUB+=	SOVERSION="${SOVERSION}" SOMAJVER="${SOMAJVER}"
 SUB_FILES+=	pkg-message
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	DOCS LIBEV LIBEVENT LIBUV
+OPTIONS_DEFINE=	DOCS LIBEV LIBEVENT LIBUV STUBBY
 
 LIBEV_DESC=	Build with libev extension
 LIBEVENT_DESC=	Build with libevent extension
 LIBUV_DESC=	Build with libuv extension
+STUBBY_DESC=	Build with Stubby DNS/TLS resolver
 
 LIBEV_LIB_DEPENDS=	libev.so:devel/libev
 LIBEV_CONFIGURE_WITH=	libev
@@ -44,6 +46,8 @@ LIBEVENT_LIB_DEPENDS=	libevent_core.so:devel/libevent
 LIBEVENT_CONFIGURE_WITH=libevent
 LIBUV_LIB_DEPENDS=	libuv.so:devel/libuv
 LIBUV_CONFIGURE_WITH=	libuv
+STUBBY_LIB_DEPENDS=	libyaml.so:textproc/libyaml
+STUBBY_CONFIGURE_WITH=	stubby
 
 post-patch:
 	${REINPLACE_CMD} -Ee 's,^(sharedoc = ).*,\1${WRKDIR}/doc,' \
@@ -53,4 +57,7 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgetdns*.so.*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/getdns_query
 
+post-install-STUBBY-on:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/stubby
+
 .include <bsd.port.mk>
diff --git a/dns/getdns/pkg-plist b/dns/getdns/pkg-plist
index 04ce5db4229f..7234d9fa7661 100644
--- a/dns/getdns/pkg-plist
+++ b/dns/getdns/pkg-plist
@@ -1,4 +1,5 @@
 bin/getdns_query
+%%STUBBY%%bin/stubby
 include/getdns/getdns.h
 include/getdns/getdns_extra.h
 %%LIBEV%%include/getdns/getdns_ext_libev.h