diff --git a/net/coturn/Makefile b/net/coturn/Makefile
index 062803dfe877..ef03e9b18fcb 100644
--- a/net/coturn/Makefile
+++ b/net/coturn/Makefile
@@ -1,38 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	coturn
 DISTVERSION=	4.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	TURN server
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libevent_core.so:devel/libevent
 
 USES=		gettext-runtime gmake mysql pkgconfig shebangfix sqlite ssl
 USE_GITHUB=	yes
 
 SHEBANG_FILES=	examples/scripts/oauth.sh examples/scripts/restapi/shared_secret_maintainer.pl
 
+USE_RC_SUBR=	turnserver
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --enable-shared --turndbdir=/var/db/${PORTNAME}
 
-SUB_FILES=	turnserver-service
-
 DOCSDIR=	${PREFIX}/share/doc/turnserver
 EXAMPLESDIR=	${PREFIX}/share/examples/turnserver
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/turnserver-service ${STAGEDIR}${PREFIX}/etc/rc.d/turnserver
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
 .include <bsd.port.mk>
diff --git a/net/coturn/files/turnserver-service.in b/net/coturn/files/turnserver-service.in
deleted file mode 100644
index 7cfb7632bc16..000000000000
--- a/net/coturn/files/turnserver-service.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-#
-# PROVIDE: turnserver
-# REQUIRE: DAEMON
-# BEFORE: mail
-# KEYWORD: shutdown
-#
-
-. /etc/rc.subr
-
-name="turnserver"
-rcvar="${name}_enable"
-command="%%PREFIX%%/bin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="%%PREFIX%%/etc/${name}.conf"
-
-load_rc_config ${name}
-
-: ${turnserver_enable="NO"}
-: ${turnserver_flags="-o"}
-: ${turnserver_configfile:=%%PREFIX%%/etc/$name.conf}
-
-command_args="-c ${turnserver_configfile} ${turnserver_flags}"
-
-run_rc_command "$1"
diff --git a/net/coturn/files/turnserver.in b/net/coturn/files/turnserver.in
new file mode 100644
index 000000000000..c0eaf4dc113f
--- /dev/null
+++ b/net/coturn/files/turnserver.in
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: turnserver
+# REQUIRE: DAEMON
+# BEFORE: mail
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name=turnserver
+rcvar=turnserver_enable
+desc=TURN and STUN server
+
+load_rc_config ${name}
+
+: ${turnserver_enable:="NO"}
+: ${turnserver_configfile:=%%PREFIX%%/etc/$name.conf}
+
+command="%%PREFIX%%/bin/${name}"
+required_files="%%PREFIX%%/etc/${name}.conf"
+start_precmd=find_pidfile
+stop_precmd=find_pidfile
+status_precmd=find_pidfile
+command_args="-o -c ${turnserver_configfile}"
+
+find_pidfile()
+{
+        if get_pidfile_from_conf pidfile $turnserver_configfile; then
+                pidfile="$_pidfile_from_conf"
+        else
+                pidfile="/var/run/${name}.pid"
+        fi
+}
+
+run_rc_command "$1"
diff --git a/net/coturn/pkg-plist b/net/coturn/pkg-plist
index 52566ed12679..a71ea9cdd5df 100644
--- a/net/coturn/pkg-plist
+++ b/net/coturn/pkg-plist
@@ -1,35 +1,34 @@
 bin/turnadmin
 bin/turnserver
 bin/turnutils_natdiscovery
 bin/turnutils_oauth
 bin/turnutils_peer
 bin/turnutils_stunclient
 bin/turnutils_uclient
-etc/rc.d/turnserver
 @sample etc/turnserver.conf.default etc/turnserver.conf
 include/turn/client/TurnMsgLib.h
 include/turn/client/ns_turn_ioaddr.h
 include/turn/client/ns_turn_msg.h
 include/turn/client/ns_turn_msg_addr.h
 include/turn/client/ns_turn_msg_defs.h
 include/turn/client/ns_turn_msg_defs_experimental.h
 include/turn/ns_turn_defs.h
 lib/libturnclient.a
 man/man1/coturn.1.gz
 man/man1/turnadmin.1.gz
 man/man1/turnserver.1.gz
 man/man1/turnutils.1.gz
 man/man1/turnutils_natdiscovery.1.gz
 man/man1/turnutils_oauth.1.gz
 man/man1/turnutils_peer.1.gz
 man/man1/turnutils_stunclient.1.gz
 man/man1/turnutils_uclient.1.gz
 share/turnserver/schema.mongo.sh
 share/turnserver/schema.sql
 share/turnserver/schema.stats.redis
 share/turnserver/schema.userdb.redis
 share/turnserver/testmongosetup.sh
 share/turnserver/testredisdbsetup.sh
 share/turnserver/testsqldbsetup.sql
 /var/db/coturn/turndb
 @dir /var/db/coturn