diff --git a/dns/doh-proxy/Makefile b/dns/doh-proxy/Makefile
index cdca83b5c188..a6030e46c347 100644
--- a/dns/doh-proxy/Makefile
+++ b/dns/doh-proxy/Makefile
@@ -1,32 +1,34 @@
 PORTNAME=	doh-proxy
 DISTVERSION=	0.9.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	CRATESIO
 DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${CARGO_CRATE_EXT}
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	DNS-over-HTTP server proxy
 WWW=		https://github.com/DNSCrypt/doh-server
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	fails to build
 USES=		cargo
 
+USE_RC_SUBR=	doh-proxy
+
 PLIST_FILES=	bin/doh-proxy
 
 # make cargo-crates > Makefile.crates
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc
 LIB_DEPENDS+=	libatomic.so:lang/gcc${GCC_DEFAULT}
 LDFLAGS+=	-L/usr/local/lib/gcc${GCC_DEFAULT} -latomic
 .endif
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/doh-proxy
 
 .include <bsd.port.mk>
diff --git a/dns/doh-proxy/files/doh-proxy.in b/dns/doh-proxy/files/doh-proxy.in
new file mode 100644
index 000000000000..dc656afb51e5
--- /dev/null
+++ b/dns/doh-proxy/files/doh-proxy.in
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# PROVIDE: doh-proxy
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+# Add the following line in /etc/rc.conf to enable doh-proxy:
+#
+# doh_proxy_enable="YES"
+# doh_proxy_flags="<set as needed>"
+#
+
+. /etc/rc.subr
+
+name=doh_proxy
+rcvar=doh_proxy_enable
+
+load_rc_config ${name}
+
+: ${doh_proxy_enable:="NO"}
+: ${doh_proxy_flags:=""}
+
+command="%%PREFIX%%/bin/doh-proxy"
+pidfile="/var/run/${name}.pid"
+
+start_cmd="${name}_start"
+
+doh_proxy_start()
+{
+    echo -n "Starting ${name}."
+    /usr/sbin/daemon -u nobody -S -p ${pidfile} \
+        ${command} ${doh_proxy_flags} && \
+        echo "Done"
+}
+
+run_rc_command "$1"