diff --git a/sysutils/rsyslog3/Makefile b/sysutils/rsyslog3/Makefile
index a8239aa1b83a..41b200fad77b 100644
--- a/sysutils/rsyslog3/Makefile
+++ b/sysutils/rsyslog3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	Enhanced syslog daemon
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--enable-rtinst --enable-debug
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\
-		${WRKSRC}/syslogd.c
+		${WRKSRC}/tools/syslogd.c
 	@${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\
 		's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|'
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
diff --git a/sysutils/rsyslog3/bsd.rsyslog.mk b/sysutils/rsyslog3/bsd.rsyslog.mk
index 53406e58f3b2..2e06404eda40 100644
--- a/sysutils/rsyslog3/bsd.rsyslog.mk
+++ b/sysutils/rsyslog3/bsd.rsyslog.mk
@@ -1,8 +1,8 @@
 PORTNAME?=	rsyslog
-PORTVERSION?=	3.17.2
+PORTVERSION?=	3.20.2
 CATEGORIES?=	sysutils
-MASTER_SITES?=	CENKES http://download.rsyslog.com/rsyslog/
-MAINTAINER?=	ports@FreeBSD.org
+MASTER_SITES?=	http://download.rsyslog.com/rsyslog/
+MAINTAINER?=	miwi@FreeBSD.org
 
 CONFLICTS=	rsyslog-2.[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/rsyslog3/distinfo b/sysutils/rsyslog3/distinfo
index c390847b6247..3923a5ff7004 100644
--- a/sysutils/rsyslog3/distinfo
+++ b/sysutils/rsyslog3/distinfo
@@ -1,3 +1,3 @@
-MD5 (rsyslog-3.17.2.tar.gz) = bfec588a23adb2bebec83a7a2a5962d4
-SHA256 (rsyslog-3.17.2.tar.gz) = 8a1437434f5489d331b70dafe1a2874c9053f7f6df1c567f982e6d25f62ba3b5
-SIZE (rsyslog-3.17.2.tar.gz) = 1086281
+MD5 (rsyslog-3.20.2.tar.gz) = bf4379015fd9df47c45d229eb9ac3e1a
+SHA256 (rsyslog-3.20.2.tar.gz) = e5406a8d7571d0b7f035ad647035bb5b52685316acc55a4fb37c4caabdf63676
+SIZE (rsyslog-3.20.2.tar.gz) = 1298126
diff --git a/sysutils/rsyslog3/pkg-plist b/sysutils/rsyslog3/pkg-plist
index 5bb61f6b924c..997e262650a0 100644
--- a/sysutils/rsyslog3/pkg-plist
+++ b/sysutils/rsyslog3/pkg-plist
@@ -14,6 +14,10 @@ lib/rsyslog/imuxsock.la
 lib/rsyslog/imuxsock.so
 lib/rsyslog/lmnet.la
 lib/rsyslog/lmnet.so
+lib/rsyslog/lmnetstrms.la
+lib/rsyslog/lmnetstrms.so
+lib/rsyslog/lmnsd_ptcp.la
+lib/rsyslog/lmnsd_ptcp.so
 lib/rsyslog/lmregexp.la
 lib/rsyslog/lmregexp.so
 lib/rsyslog/lmtcpclt.la
@@ -26,27 +30,37 @@ lib/rsyslog/omtesting.la
 lib/rsyslog/omtesting.so
 sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/build_from_repo.html
 %%PORTDOCS%%%%DOCSDIR%%/contributors.html
 %%PORTDOCS%%%%DOCSDIR%%/debug.html
 %%PORTDOCS%%%%DOCSDIR%%/dev_queue.html
 %%PORTDOCS%%%%DOCSDIR%%/expression.html
 %%PORTDOCS%%%%DOCSDIR%%/features.html
 %%PORTDOCS%%%%DOCSDIR%%/generic_design.html
+%%PORTDOCS%%%%DOCSDIR%%/gssapi.html
 %%PORTDOCS%%%%DOCSDIR%%/history.html
 %%PORTDOCS%%%%DOCSDIR%%/how2help.html
+%%PORTDOCS%%%%DOCSDIR%%/im3195.html
 %%PORTDOCS%%%%DOCSDIR%%/imfile.html
 %%PORTDOCS%%%%DOCSDIR%%/imgssapi.html
 %%PORTDOCS%%%%DOCSDIR%%/imklog.html
 %%PORTDOCS%%%%DOCSDIR%%/imrelp.html
 %%PORTDOCS%%%%DOCSDIR%%/imtcp.html
 %%PORTDOCS%%%%DOCSDIR%%/imuxsock.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install.html
 %%PORTDOCS%%%%DOCSDIR%%/ipv6.html
+%%PORTDOCS%%%%DOCSDIR%%/licensing.html
 %%PORTDOCS%%%%DOCSDIR%%/log_rotation_fix_size.html
 %%PORTDOCS%%%%DOCSDIR%%/man_rsyslogd.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/netstream.html
+%%PORTDOCS%%%%DOCSDIR%%/ns_gtls.html
+%%PORTDOCS%%%%DOCSDIR%%/ns_ptcp.html
 %%PORTDOCS%%%%DOCSDIR%%/omlibdbi.html
+%%PORTDOCS%%%%DOCSDIR%%/ommail.html
+%%PORTDOCS%%%%DOCSDIR%%/omrelp.html
 %%PORTDOCS%%%%DOCSDIR%%/omsnmp.html
 %%PORTDOCS%%%%DOCSDIR%%/professional_support.html
 %%PORTDOCS%%%%DOCSDIR%%/property_replacer.html
@@ -89,8 +103,21 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_secure_tls.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_stunnel.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_tls.html
+%%PORTDOCS%%%%DOCSDIR%%/status.html
 %%PORTDOCS%%%%DOCSDIR%%/syslog-protocol.html
+%%PORTDOCS%%%%DOCSDIR%%/tls_cert_ca.html
+%%PORTDOCS%%%%DOCSDIR%%/tls_cert_client.html
+%%PORTDOCS%%%%DOCSDIR%%/tls_cert_errmsgs.html
+%%PORTDOCS%%%%DOCSDIR%%/tls_cert_machine.html
+%%PORTDOCS%%%%DOCSDIR%%/tls_cert_scenario.html
+%%PORTDOCS%%%%DOCSDIR%%/tls_cert_server.html
+%%PORTDOCS%%%%DOCSDIR%%/tls_cert_summary.html
+%%PORTDOCS%%%%DOCSDIR%%/tls_cert_udp_relay.html
+%%PORTDOCS%%%%DOCSDIR%%/troubleshoot.html
 %%PORTDOCS%%%%DOCSDIR%%/v3compatibility.html
 %%PORTDOCS%%%%DOCSDIR%%/version_naming.html
 @dirrmtry lib/rsyslog