diff --git a/srcpkgs/rsyslog-docs b/srcpkgs/rsyslog-docs
new file mode 120000
index 00000000000..4ade98bc4c2
--- /dev/null
+++ b/srcpkgs/rsyslog-docs
@@ -0,0 +1 @@
+rsyslog
\ No newline at end of file
diff --git a/srcpkgs/rsyslog-gssapi b/srcpkgs/rsyslog-gssapi
new file mode 120000
index 00000000000..4ade98bc4c2
--- /dev/null
+++ b/srcpkgs/rsyslog-gssapi
@@ -0,0 +1 @@
+rsyslog
\ No newline at end of file
diff --git a/srcpkgs/rsyslog/rsyslog-docs.template b/srcpkgs/rsyslog/rsyslog-docs.template
new file mode 100644
index 00000000000..8413ab1eb09
--- /dev/null
+++ b/srcpkgs/rsyslog/rsyslog-docs.template
@@ -0,0 +1,14 @@
+# Template file for 'rsyslog-docs'.
+#
+short_desc="${sourcepkg} HTML documentation"
+long_desc="${long_desc}
+
+ This package contains the included HTML documentation."
+
+noarch=yes
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/rsyslog/rsyslog-gssapi.template b/srcpkgs/rsyslog/rsyslog-gssapi.template
new file mode 100644
index 00000000000..e096bd1a66e
--- /dev/null
+++ b/srcpkgs/rsyslog/rsyslog-gssapi.template
@@ -0,0 +1,17 @@
+# Template file for 'rsyslog-gssapi'.
+#
+short_desc="${sourcepkg} Kerberos5 GSSAPI add-on"
+long_desc="${long_desc}
+
+ This package contains the Kerberos5 GSSAPI add-on."
+
+Add_dependency run glibc
+Add_dependency run rsyslog
+Add_dependency run mit-krb5-libs
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib/rsyslog
+	mv ${SRCPKGDESTDIR}/usr/lib/rsyslog/*gss*.so \
+		${DESTDIR}/usr/lib/rsyslog
+}
diff --git a/srcpkgs/rsyslog/rsyslog-mysql.template b/srcpkgs/rsyslog/rsyslog-mysql.template
index 48a0e0f918c..4a6e305c031 100644
--- a/srcpkgs/rsyslog/rsyslog-mysql.template
+++ b/srcpkgs/rsyslog/rsyslog-mysql.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains the MySQL add-on to store log messages."
 
-revision=1
-
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run openssl
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 74ae6c19c53..cf95ea998cf 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,19 +1,20 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
-version=4.6.2
-revision=1
+version=5.4.0
 distfiles="http://download.rsyslog.com/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--enable-gnutls --enable-mysql --enable-pgsql"
+configure_args="--enable-gnutls --enable-mysql --enable-pgsql
+--enable-imdiag --enable-imfile --enable-mail --enable-gssapi-krb5"
 short_desc="An Enhanced multi-threaded syslog daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=a58add0e7b9474afaba704422ee6310e8caa6f0881f2b71aa350917540f2c124
+checksum=d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228
 long_desc="
  Rsyslog is an enhanced multi-threaded syslogd supporting, among
  others, MySQL, PgSQL, syslog/tcp, RFC 3195, permitted sender lists,
  filtering on any message part, and fine grain output format control."
 
-subpackages="$pkgname-gnutls $pkgname-mysql $pkgname-postgresql"
+subpackages="$pkgname-docs $pkgname-gssapi $pkgname-gnutls"
+subpackages="${subpackages} $pkgname-mysql $pkgname-postgresql"
 conf_files="/etc/rsyslog.conf /etc/conf.d/rsyslogd"
 openrc_services="rsyslogd default true"
 
@@ -34,4 +35,8 @@ post_install()
 	install -m644 ${FILESDIR}/rsyslog.conf ${DESTDIR}/etc/rsyslog.conf
 	install -m644 ${FILESDIR}/rsyslog.logrotate \
 		${DESTDIR}/etc/logrotate.d/rsyslog
+	# Install HTML documentation.
+	install -d ${DESTDIR}/usr/share/doc/rsyslog/html
+	install -m644 ${wrksrc}/doc/*.{html,png} \
+		${DESTDIR}/usr/share/doc/rsyslog/html
 }