diff --git a/rsyslog-5.8.4.tar.bz2 b/rsyslog-5.8.4.tar.bz2
deleted file mode 100644
index d2c9745..0000000
--- a/rsyslog-5.8.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:699c719723c9d3f227b6550df5502429bac7669efd84c3ec7c53699c1eff3e87
-size 1906929
diff --git a/rsyslog-5.8.5.tar.bz2 b/rsyslog-5.8.5.tar.bz2
new file mode 100644
index 0000000..f64bc0a
--- /dev/null
+++ b/rsyslog-5.8.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cfdc128f8b3ab88e36f85ce8fb12ff8d19790181b7b0138f97afda42c256ee78
+size 1909999
diff --git a/rsyslog.changes b/rsyslog.changes
index f180b5a..e615120 100644
--- a/rsyslog.changes
+++ b/rsyslog.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Sep  7 12:58:48 UTC 2011 - mrueckert@suse.de
+
+- update to 5.8.5 [V5-stable]
+  - bugfix/security: off-by-two bug in legacy syslog parser,
+    CVE-2011-3200 bnc#714658
+  - bugfix: mark message processing did not work correctly
+  - bugfix: potential hang condition during tag emulation
+  - bugfix: too-early string termination during tag emulation
+  - bugfix: The NUL-Byte for the syslogtag was not copied in MsgDup
+    (msg.c)
+  - bugfix: fixed incorrect state handling for Discard Action
+    (transactions) Note: This caused all messages in a batch to be
+    set to COMMITTED, even if they were discarded. 
+
 -------------------------------------------------------------------
 Wed Aug 24 11:05:18 UTC 2011 - mt@suse.de
 
@@ -7,7 +22,7 @@ Wed Aug 24 11:05:18 UTC 2011 - mt@suse.de
   installation from spec file. (fate#311316).
 
 -------------------------------------------------------------------
-Fri Aug 19 13:04:45 UTC 2011 - mrueckert@suse.com
+Fri Aug 19 13:04:45 UTC 2011 - mrueckert@suse.de
 
 - Update to 5.8.4 [V5-stable]
   - bugfix: potential misadressing in property replacer
@@ -35,27 +50,27 @@ Tue Aug  2 07:35:13 UTC 2011 - aj@suse.de
 - Require systemd-devel to follow package split.
 
 -------------------------------------------------------------------
-Wed Jul 13 11:10:15 UTC 2011 - mrueckert@suse.com
+Wed Jul 13 11:10:15 UTC 2011 - mrueckert@suse.de
 
 - drop modules imtemplate and omtemplate, the 2 modules are base
   templates for people who want to develop their own modules.
 
 -------------------------------------------------------------------
-Tue Jul 12 13:35:54 UTC 2011 - mrueckert@suse.com
+Tue Jul 12 13:35:54 UTC 2011 - mrueckert@suse.de
 
 - enabled a few more modules which dont pull extra dependencies:
   impstats, pmcisconames, pmaixforwardedfrom, pmsnare, pmrfc3164sd,
   omruleset, mmsnmptrapd
 
 -------------------------------------------------------------------
-Tue Jul 12 13:11:04 UTC 2011 - mrueckert@suse.com
+Tue Jul 12 13:11:04 UTC 2011 - mrueckert@suse.de
 
 - guard the file list entry for rsyslog.service with
   if {with systemd}. Please keep the package working on older
   distros.
 
 -------------------------------------------------------------------
-Tue Jul 12 12:59:13 UTC 2011 - mrueckert@suse.com
+Tue Jul 12 12:59:13 UTC 2011 - mrueckert@suse.de
 
 - upstream asked to change the syntax in the default config files
   to the new syntax:
@@ -70,7 +85,7 @@ Tue Jul 12 12:59:13 UTC 2011 - mrueckert@suse.com
   new: *.emerg :omusrmsg:*
 
 -------------------------------------------------------------------
-Tue Jul 12 12:52:58 UTC 2011 - mrueckert@suse.com
+Tue Jul 12 12:52:58 UTC 2011 - mrueckert@suse.de
 
 - Updated to 5.8.3  [V5-stable]
   - systemd support: set stdout/stderr to null - thx to Lennart for
diff --git a/rsyslog.spec b/rsyslog.spec
index 01da2d8..5f27840 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -20,7 +20,7 @@
 
 Name:           rsyslog
 Summary:        The enhanced syslogd for Linux and Unix
-Version:        5.8.4
+Version:        5.8.5
 Release:        4
 # for setting those bcond_with* configs see
 # http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/