diff --git a/net/endlessh/Makefile b/net/endlessh/Makefile
index 8a0319f8f77c..66636d3ea333 100644
--- a/net/endlessh/Makefile
+++ b/net/endlessh/Makefile
@@ -1,28 +1,33 @@
 PORTNAME=	endlessh
 PORTVERSION=	1.1
 CATEGORIES=	net
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	SSH tarpit
 
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/UNLICENSE
 
 USE_RC_SUBR=	endlessh
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	skeeto
 
 PLIST_FILES=	bin/endlessh \
 		man/man1/endlessh.1.gz \
-		"@sample ${PREFIX}/etc/endlessh.conf.sample"
+		"@sample ${PREFIX}/etc/endlessh.conf.sample" \
+		${PREFIX}/etc/endlessh.newsyslog.conf
+
+SUB_FILES=	pkg-message
 
 post-patch:
 	${REINPLACE_CMD} 's|share/man|man|;s|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} 's|/etc/endlessh/config|${PREFIX}/etc/endlessh.conf|' \
 		${WRKSRC}/endlessh.c ${WRKSRC}/endlessh.1
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/endlessh.conf.sample ${STAGEDIR}${PREFIX}/etc/
+	${INSTALL_DATA} ${FILESDIR}/endlessh.newsyslog.conf \
+		${FILESDIR}/endlessh.conf.sample ${STAGEDIR}${PREFIX}/etc/
+	${STRIP} ${STAGEDIR}${PREFIX}/bin/endlessh
 
 .include <bsd.port.mk>
diff --git a/net/endlessh/files/endlessh.in b/net/endlessh/files/endlessh.in
index f54ab6b46f4e..abc5ec9d59cf 100644
--- a/net/endlessh/files/endlessh.in
+++ b/net/endlessh/files/endlessh.in
@@ -1,33 +1,34 @@
 #!/bin/sh
 #
 # Author: Bernard Spil <brnrd@FreeBSD.org>
 
 # PROVIDE: endlessh
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable endlessh:
 # endlessh_enable="YES"
 # endlessh_daemonuser="nobody"
 # endlessh_config="<config file>" Default %%PREFIX%%/etc/endlessh.conf
 # endlessh_logfile"<log file>" Default /var/log/endlessh.log
 # endlessh_args="<set as needed>" these override the conf file
 
 . /etc/rc.subr
 
 name=endlessh
 rcvar=endlessh_enable
 
 load_rc_config $name
 
 : ${endlessh_enable:=NO}
 : ${endlessh_daemonuser:=nobody}
 : ${endlessh_config:=%%PREFIX%%/etc/endlessh.conf}
 : ${endlessh_logfile:=/var/log/endlessh.log}
 
 pidfile=/var/run/endlessh.pid
+daemonpidfile=/var/run/daemon_endlessh.pid
 procname="%%PREFIX%%/bin/endlessh"
 command=/usr/sbin/daemon
-command_args='-p ${pidfile} -u ${endlessh_daemonuser} -o ${endlessh_logfile} ${procname} -f ${endlessh_config} ${endlessh_args}'
+command_args='-p ${pidfile} -P ${daemonpidfile} -u ${endlessh_daemonuser} -Ho ${endlessh_logfile} ${procname} -f ${endlessh_config} ${endlessh_args}'
 
 run_rc_command $1
diff --git a/net/endlessh/files/endlessh.newsyslog.conf b/net/endlessh/files/endlessh.newsyslog.conf
new file mode 100644
index 000000000000..e50538e4dcf4
--- /dev/null
+++ b/net/endlessh/files/endlessh.newsyslog.conf
@@ -0,0 +1,11 @@
+# newsyslog configuration file for endlessh(1)
+#
+# Link (or copy) endlessh.newsyslog.conf to /usr/local/etc/newsyslog.conf.d/
+# to take care of log rotation.
+#
+# ln -s /usr/local/etc/endlessh.newsyslog.conf /usr/local/etc/newsyslog.conf.d
+#
+# See newsyslog.conf(5) for details.
+#
+# logfilename          [owner:group]    mode count size when  flags [/pid_file] [sig_num]
+/var/log/endlessh.log		root:wheel	600   7	   *	@T00  G	    /var/run/daemon_endlessh.pid SIGHUP
diff --git a/net/endlessh/pkg-message b/net/endlessh/files/pkg-message.in
similarity index 52%
rename from net/endlessh/pkg-message
rename to net/endlessh/files/pkg-message.in
index c34ff0613686..3dea43343029 100644
--- a/net/endlessh/pkg-message
+++ b/net/endlessh/files/pkg-message.in
@@ -1,21 +1,32 @@
 [
 {
   type: install
   message: <<EOD
 
 Configure endlessh either via endlessh.conf or using endlessh_args in rc.conf.
 The defaults are commented out in endlessh.conf.
 
 The default configuration only logs starts & stops to /var/log/endlessh.log.
 To see the connections set LogLevel 1 in endlessh.conf or add "-v" to
 endlessh_args. Sending SIGUSR1 to endlessh (pkill USR1 endlessh) will add
 statistics to the /var/log/endlessh.log file
 
-Neither endlessh nor daemon support rotating the logfile, use periodic or
-cron to copy the logfile and truncate it using
+Link (or copy) endlessh.newsyslog.conf to ${PREFIX}/newsyslog.conf.d/
+to take care of log rotation.
 
-   $ echo -n > /var/log/endlessh.log
+ln -s ${PREFIX}/etc/endlessh.newsyslog.conf $PREFIX}/etc/newsyslog.conf.d/
 
 EOD
 }
+,
+{
+  type: upgrade
+  message: <<EOD
+
+Link (or copy) endlessh.newsyslog.conf to %%PREFIX%%/newsyslog.conf.d/
+to take care of log rotation.
+
+ln -s %%PREFIX%%/etc/endlessh.newsyslog.conf %%PREFIX%%/etc/newsyslog.conf.d/
+
+EOD
 ]