diff --git a/srcpkgs/rsyslog/files/rsyslog.conf b/srcpkgs/rsyslog/files/rsyslog.conf
index fbc850fb13..47cedd1ab6 100644
--- a/srcpkgs/rsyslog/files/rsyslog.conf
+++ b/srcpkgs/rsyslog/files/rsyslog.conf
@@ -9,6 +9,9 @@ $ModLoad immark   # provides --MARK-- message capability
 $ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
 $ModLoad imklog   # kernel logging (formerly provided by rklogd)
 
+# Include config file snippets.
+$IncludeConfig /etc/rsyslog.d/
+
 # Log all kernel messages to the console.
 # Logging much else clutters up the screen.
 #kern.*                                                 /dev/console
diff --git a/srcpkgs/rsyslog/patches/librsyslog_link_to_libz.diff b/srcpkgs/rsyslog/patches/librsyslog_link_to_libz.diff
deleted file mode 100644
index 6b9346327c..0000000000
--- a/srcpkgs/rsyslog/patches/librsyslog_link_to_libz.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-librsyslog needs to be linked to libz, because parser.c uses uncompress()
-unconditionally and zlib is not linked in.
-
---- runtime/Makefile.in.orig	2010-11-02 07:17:30.000000000 +0100
-+++ runtime/Makefile.in	2010-11-02 07:17:54.000000000 +0100
-@@ -482,7 +482,7 @@ librsyslog_la_SOURCES = \
- # runtime or will no longer be needed. -- rgerhards, 2008-06-13
- @WITH_MODDIRS_TRUE@librsyslog_la_CPPFLAGS = -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\" $(PTHREADS_CFLAGS)
- #librsyslog_la_LDFLAGS = -module -avoid-version
--librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS)
-+librsyslog_la_LIBADD = $(ZLIB_LIBS) $(DL_LIBS) $(RT_LIBS)
- @ENABLE_REGEXP_TRUE@lmregexp_la_SOURCES = regexp.c regexp.h
- @ENABLE_REGEXP_TRUE@lmregexp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
- @ENABLE_REGEXP_TRUE@lmregexp_la_LDFLAGS = -module -avoid-version
diff --git a/srcpkgs/rsyslog/patches/runtime_missing_symbols.patch b/srcpkgs/rsyslog/patches/runtime_missing_symbols.patch
new file mode 100644
index 0000000000..b4ff801f0f
--- /dev/null
+++ b/srcpkgs/rsyslog/patches/runtime_missing_symbols.patch
@@ -0,0 +1,73 @@
+--- runtime/Makefile.am.orig	2012-01-14 10:20:51.235371487 +0100
++++ runtime/Makefile.am	2012-01-14 10:22:02.857662520 +0100
+@@ -115,7 +115,7 @@ else
+ librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I$(top_srcdir) $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS)
+ endif
+ #librsyslog_la_LDFLAGS = -module -avoid-version
+-librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS)
++librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBESTR_LIBS) $(LIBEE_LIBS)
+ 
+ #
+ # regular expression support
+@@ -125,7 +125,7 @@ pkglib_LTLIBRARIES += lmregexp.la
+ lmregexp_la_SOURCES = regexp.c regexp.h
+ lmregexp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
+ lmregexp_la_LDFLAGS = -module -avoid-version
+-lmregexp_la_LIBADD =
++lmregexp_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS)
+ endif
+ 
+ #
+@@ -136,7 +136,7 @@ pkglib_LTLIBRARIES += lmzlibw.la
+ lmzlibw_la_SOURCES = zlibw.c zlibw.h
+ lmzlibw_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
+ lmzlibw_la_LDFLAGS = -module -avoid-version
+-lmzlibw_la_LIBADD =
++lmzlibw_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS) $(ZLIB_LIBS)
+ endif
+ 
+ if ENABLE_INET
+@@ -147,7 +147,7 @@ pkglib_LTLIBRARIES += lmnet.la lmnetstrm
+ lmnet_la_SOURCES = net.c net.h
+ lmnet_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
+ lmnet_la_LDFLAGS = -module -avoid-version
+-lmnet_la_LIBADD =
++lmnet_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS)
+ 
+ # network stream master class and stream factory
+ lmnetstrms_la_SOURCES = netstrms.c netstrms.h \
+@@ -156,14 +156,14 @@ lmnetstrms_la_SOURCES = netstrms.c netst
+ 			nspoll.c nspoll.h
+ lmnetstrms_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
+ lmnetstrms_la_LDFLAGS = -module -avoid-version
+-lmnetstrms_la_LIBADD =
++lmnetstrms_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS)
+ 
+ # generic stream server framework
+ pkglib_LTLIBRARIES += lmstrmsrv.la
+ lmstrmsrv_la_SOURCES = strmsrv.c strmsrv.h strms_sess.c strms_sess.h
+ lmstrmsrv_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
+ lmstrmsrv_la_LDFLAGS = -module -avoid-version
+-lmstrmsrv_la_LIBADD =
++lmstrmsrv_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS)
+ 
+ # netstream drivers
+ 
+@@ -174,7 +174,7 @@ lmnsd_ptcp_la_SOURCES = nsd_ptcp.c nsd_p
+ 			nsdpoll_ptcp.c nsdpoll_ptcp.h
+ lmnsd_ptcp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
+ lmnsd_ptcp_la_LDFLAGS = -module -avoid-version
+-lmnsd_ptcp_la_LIBADD =
++lmnsd_ptcp_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS)
+ endif # if ENABLE_INET
+ 
+ #
+@@ -185,7 +185,7 @@ pkglib_LTLIBRARIES += lmnsd_gtls.la
+ lmnsd_gtls_la_SOURCES = nsd_gtls.c nsd_gtls.h nsdsel_gtls.c  nsdsel_gtls.h
+ lmnsd_gtls_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(GNUTLS_CFLAGS)
+ lmnsd_gtls_la_LDFLAGS = -module -avoid-version
+-lmnsd_gtls_la_LIBADD = $(GNUTLS_LIBS)
++lmnsd_gtls_la_LIBADD = $(GNUTLS_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS)
+ endif
+ 
+ update-systemd:
diff --git a/srcpkgs/rsyslog/rsyslog-gnutls.rshlibs b/srcpkgs/rsyslog/rsyslog-gnutls.rshlibs
index ba423618de..f34d857590 100644
--- a/srcpkgs/rsyslog/rsyslog-gnutls.rshlibs
+++ b/srcpkgs/rsyslog/rsyslog-gnutls.rshlibs
@@ -1,2 +1,7 @@
 libgnutls.so.26
 libc.so.6
+libpthread.so.0
+libdl.so.2
+librt.so.1
+libestr.so.0
+libee.so.0
diff --git a/srcpkgs/rsyslog/rsyslog.rshlibs b/srcpkgs/rsyslog/rsyslog.rshlibs
index 83fab5d57b..720048fd7e 100644
--- a/srcpkgs/rsyslog/rsyslog.rshlibs
+++ b/srcpkgs/rsyslog/rsyslog.rshlibs
@@ -3,3 +3,5 @@ libz.so.1
 libdl.so.2
 librt.so.1
 libc.so.6
+libestr.so.0
+libee.so.0
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 9b135b82ed..300096303b 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,17 +1,22 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
-version=5.8.6
-revision=1
+version=6.2.0
 homepage="http://www.rsyslog.com"
 distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-gnutls --enable-mysql --enable-pgsql
 --enable-imdiag --enable-imfile --enable-mail --enable-gssapi-krb5
--with-systemdsystemunitdir=/lib/systemd/system"
+-with-systemdsystemunitdir=/lib/systemd/system --enable-zlib
+--enable-imptcp --enable-imttcp --enable-mmsnmptrapd
+--enable-impstats --enable-omprog --enable-omstdout
+--enable-pmlastmsg --enable-pmcisconames --enable-pmaixforwardedfrom
+--enable-pmsnare --enable-pmrfc3164sd --enable-omuxsock
+--enable-smcustbindcdr --enable-imtemplate --enable-omtemplate
+LDFLAGS=-Wl,--allow-shlib-undefined"
 short_desc="An Enhanced multi-threaded syslog daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
-checksum=c51206e3b11c7b4cddf92607b9d6ddd07430ff7dd8d06849804c9ea1c9191825
+checksum=f8869a1c25d0dd9ff04468743969ffc9ff89c6f7afa3046f77f91c3982543cc1
 long_desc="
  Rsyslog is an enhanced multi-threaded syslogd supporting, among
  others, MySQL, PgSQL, syslog/tcp, RFC 3195, permitted sender lists,
@@ -23,17 +28,24 @@ conf_files="/etc/rsyslog.conf"
 systemd_services="rsyslog.service on"
 provides="syslog-daemon-0"
 replaces="syslog-daemon>=0"
+make_dirs="/etc/rsyslog.d 0755 root root"
 build_requires=11
+disable_parallel_build=yes
 
+Add_dependency build automake
 Add_dependency build pkg-config
 Add_dependency build zlib-devel
 Add_dependency build gnutls-devel
 Add_dependency build postgresql-libs-devel
 Add_dependency build libmysqlclient-devel
 Add_dependency build mit-krb5-devel
+Add_dependency build libee-devel
 
-post_install()
-{
+pre_configure() {
+	autoreconf -fi
+}
+
+post_install() {
 	vinstall ${FILESDIR}/rsyslog.conf 644 etc
 	vinstall ${FILESDIR}/rsyslog.logrotate 644 etc/logrotate.d rsyslog
 	# Install HTML documentation.