diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index 500790c..fa391f2 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rspamd
 PORTVERSION=	1.1.0.a.17122015
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 PKGNAMESUFFIX=	-devel
@@ -27,6 +28,7 @@ REDIRECTOR_DESC=	Install HTTP redirector
 
 USE_RC_SUBR=	rspamd
 
+SUB_FILES=	pkg-message rspamd.newsyslog.conf.sample
 PLIST_SUB+=	ETCDIR=etc/rspamd \
 		RSPAMDVERSION=${RSPAMD_VERSION}
 CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
@@ -86,5 +88,10 @@ post-stage:
 		${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf
 		# No need, since rspamd.conf.sample is a same
 		${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
+	${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR}
+
+post-install:
+	@${MKDIR} ${STAGEDIR}/usr/local/etc/newsyslog.conf.d
+	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}/usr/local/etc/newsyslog.conf.d
 
 .include <bsd.port.mk>
diff --git a/mail/rspamd-devel/files/pkg-message.in b/mail/rspamd-devel/files/pkg-message.in
new file mode 100644
index 0000000..51c0a57
--- /dev/null
+++ b/mail/rspamd-devel/files/pkg-message.in
@@ -0,0 +1,10 @@
+======================================================================
+ - Add the following line to /etc/rc.conf to enable rspamd:
+
+     rspamd_enable="YES"
+
+ - A symbolic link to %%ETCDIR%%/rspamd.newsyslog.conf
+   has been created in the /usr/local/etc/newsyslog.conf.d directory.
+   You can edit %%ETCDIR%%/rspamd.newsyslog.conf
+   to change log file rotation configuration.
+======================================================================
diff --git a/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in b/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in
new file mode 100644
index 0000000..de693aa
--- /dev/null
+++ b/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in
@@ -0,0 +1,11 @@
+# newsyslog configuration file for rspamd(8)
+#
+# Link (or copy) rspamd.newsyslog.conf to /usr/local/etc/newsyslog.conf.d/
+# to take care of log rotation.
+#
+# ln -s /usr/local/etc/rspamd/rspamd.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/rspamd/rspamd.log	nobody:nobody	644   7	   *	@T00  JC    /var/run/rspamd/rspamd.pid 30
diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist
index d65bd12..9301562 100644
--- a/mail/rspamd-devel/pkg-plist
+++ b/mail/rspamd-devel/pkg-plist
@@ -36,6 +36,8 @@ bin/rspamc
 @sample %%ETCDIR%%/surbl-whitelist.inc.sample
 @sample %%ETCDIR%%/worker-controller.inc.sample
 @sample %%ETCDIR%%/worker-normal.inc.sample
+@sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
+/usr/local/etc/newsyslog.conf.d/rspamd.newsyslog.conf
 lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/effective_tld_names.dat
 %%DATADIR%%/lua/dmarc.lua
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 39fb7cd..9b945a6 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rspamd
 PORTVERSION=	1.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 
@@ -25,6 +25,7 @@ REDIRECTOR_DESC=	Install HTTP redirector
 
 USE_RC_SUBR=	rspamd
 
+SUB_FILES=	pkg-message rspamd.newsyslog.conf.sample
 PLIST_SUB+=	ETCDIR=etc/rspamd \
 		RSPAMDVERSION=${PORTVERSION}
 CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
@@ -84,5 +85,10 @@ post-stage:
 		${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf
 		# No need, since rspamd.conf.sample is a same
 		${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
+	${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR}
+
+post-install:
+	@${MKDIR} ${STAGEDIR}/usr/local/etc/newsyslog.conf.d
+	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}/usr/local/etc/newsyslog.conf.d
 
 .include <bsd.port.mk>
diff --git a/mail/rspamd/files/pkg-message.in b/mail/rspamd/files/pkg-message.in
new file mode 100644
index 0000000..51c0a57
--- /dev/null
+++ b/mail/rspamd/files/pkg-message.in
@@ -0,0 +1,10 @@
+======================================================================
+ - Add the following line to /etc/rc.conf to enable rspamd:
+
+     rspamd_enable="YES"
+
+ - A symbolic link to %%ETCDIR%%/rspamd.newsyslog.conf
+   has been created in the /usr/local/etc/newsyslog.conf.d directory.
+   You can edit %%ETCDIR%%/rspamd.newsyslog.conf
+   to change log file rotation configuration.
+======================================================================
diff --git a/mail/rspamd/files/rspamd.newsyslog.conf.sample.in b/mail/rspamd/files/rspamd.newsyslog.conf.sample.in
new file mode 100644
index 0000000..de693aa
--- /dev/null
+++ b/mail/rspamd/files/rspamd.newsyslog.conf.sample.in
@@ -0,0 +1,11 @@
+# newsyslog configuration file for rspamd(8)
+#
+# Link (or copy) rspamd.newsyslog.conf to /usr/local/etc/newsyslog.conf.d/
+# to take care of log rotation.
+#
+# ln -s /usr/local/etc/rspamd/rspamd.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/rspamd/rspamd.log	nobody:nobody	644   7	   *	@T00  JC    /var/run/rspamd/rspamd.pid 30
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index d65bd12..9301562 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -36,6 +36,8 @@ bin/rspamc
 @sample %%ETCDIR%%/surbl-whitelist.inc.sample
 @sample %%ETCDIR%%/worker-controller.inc.sample
 @sample %%ETCDIR%%/worker-normal.inc.sample
+@sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
+/usr/local/etc/newsyslog.conf.d/rspamd.newsyslog.conf
 lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/effective_tld_names.dat
 %%DATADIR%%/lua/dmarc.lua