diff --git a/rsyslog-4.4.1.tar.bz2 b/rsyslog-4.4.1.tar.bz2
deleted file mode 100644
index cda9d53..0000000
--- a/rsyslog-4.4.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a3e8dfc558a2360486b91df3cf5461f6e2d09952b8961a4afad7c36614311d7
-size 1673535
diff --git a/rsyslog-5.4.0.tar.bz2 b/rsyslog-5.4.0.tar.bz2
new file mode 100644
index 0000000..7475a93
--- /dev/null
+++ b/rsyslog-5.4.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5dff740a69789435579382b3a16e2b101d4c6a326a2f8e86b35f54fd877baf95
+size 1772569
diff --git a/rsyslog.changes b/rsyslog.changes
index 57110a1..f677278 100644
--- a/rsyslog.changes
+++ b/rsyslog.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Apr 13 08:56:15 UTC 2010 - mt@suse.de
+
+- Updated to rsyslog version 5.4.0 (v5-stable). This version begins
+  a new stable series based on the 5.3.x series, which has been
+  proven rather well in practice. The new 5.4.0 contains fixes for
+  all known problems. See ChangeLog file for a detailed history.
+  The main new feature is speed: several optimizations were done,
+  including support for epoll in tcp listeners.
+- Added new lmzlibw.so and omruleset.so to the file list.
+- Recompressed original tar.gz source archive using bzip2.
+
 -------------------------------------------------------------------
 Wed Sep  9 21:36:16 CEST 2009 - mt@suse.de
 
diff --git a/rsyslog.spec b/rsyslog.spec
index d398c68..f837af5 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package rsyslog (Version 4.4.1)
+# spec file for package rsyslog (Version 5.4.0)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,12 +19,12 @@
 
 
 Name:           rsyslog
-%define         upstream_version 4.4.1
+%define         upstream_version 5.4.0
 %define         rsyslog_docdir %{_docdir}/%{name}
 %define         install_all_modules_in_lib 0
-Version:        4.4.1
-Release:        2
-License:        GPL v3 or later
+Version:        5.4.0
+Release:        1
+License:        GPLv3+
 Group:          System/Daemons
 Summary:        Rsyslog, the enhanced syslogd for Linux and Unix
 Url:            http://www.rsyslog.com/
@@ -64,7 +64,7 @@ Authors:
     Michael Meckelein <mmeckelein@hq.adiscon.com>, Adiscon GmbH
 
 %package doc
-License:        GPL v3 or later
+License:        GPLv3+
 Group:          System/Daemons
 Requires:       %{name} = %{version}
 Summary:        Additional documentation for rsyslog
@@ -83,7 +83,7 @@ Authors:
     Michael Meckelein <mmeckelein@hq.adiscon.com>, Adiscon GmbH
 
 %package module-gssapi
-License:        GPL v3 or later
+License:        GPLv3+
 Group:          System/Daemons
 Requires:       %{name} = %{version}
 Summary:        GSS-API support module for rsyslog
@@ -103,7 +103,7 @@ Authors:
     Michael Meckelein <mmeckelein@hq.adiscon.com>, Adiscon GmbH
 
 %package module-mysql
-License:        GPL v3 or later
+License:        GPLv3+
 Group:          System/Daemons
 Requires:       %{name} = %{version}
 Summary:        MySQL support module for rsyslog
@@ -123,7 +123,7 @@ Authors:
     Michael Meckelein <mmeckelein@hq.adiscon.com>, Adiscon GmbH
 
 %package module-pgsql
-License:        GPL v3 or later
+License:        GPLv3+
 Group:          System/Daemons
 Requires:       %{name} = %{version}
 Summary:        PostgreSQL support module for rsyslog
@@ -142,7 +142,7 @@ Authors:
     Michael Meckelein <mmeckelein@hq.adiscon.com>, Adiscon GmbH
 
 %package module-snmp
-License:        GPL v3 or later
+License:        GPLv3+
 Group:          System/Daemons
 Requires:       %{name} = %{version}
 Summary:        SNMP support module for rsyslog
@@ -162,7 +162,7 @@ Authors:
     Michael Meckelein <mmeckelein@hq.adiscon.com>, Adiscon GmbH
 
 %package module-gtls
-License:        GPL v3 or later
+License:        GPLv3+
 Group:          System/Daemons
 Requires:       %{name} = %{version}
 Summary:        TLS encryption support module for rsyslog
@@ -393,8 +393,10 @@ fi
 %{_libdir}/rsyslog/lmstrmsrv.so
 %{_libdir}/rsyslog/lmtcpclt.so
 %{_libdir}/rsyslog/lmtcpsrv.so
+%{_libdir}/rsyslog/lmzlibw.so
 %{_libdir}/rsyslog/ommail.so
 %{_libdir}/rsyslog/omprog.so
+%{_libdir}/rsyslog/omruleset.so
 %{_libdir}/rsyslog/omtemplate.so
 %{_libdir}/rsyslog/omtesting.so
 %if ! 0%{install_all_modules_in_lib}