diff --git a/clamav-0.98.4.tar.gz b/clamav-0.98.4.tar.gz
deleted file mode 100644
index 6b16550..0000000
--- a/clamav-0.98.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d3006747abcf750f395a8bfa8267ab314c7b63196c4b41e7717948aaaafa3e1c
-size 15537593
diff --git a/clamav-0.98.4.tar.gz.sig b/clamav-0.98.4.tar.gz.sig
deleted file mode 100644
index 6ac60b3..0000000
Binary files a/clamav-0.98.4.tar.gz.sig and /dev/null differ
diff --git a/clamav-0.98.5.tar.gz b/clamav-0.98.5.tar.gz
new file mode 100644
index 0000000..8e2e51e
--- /dev/null
+++ b/clamav-0.98.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c2f37d5fa9033936468237f6f4b29289f30791caa84765ef510acb56c8daa4d
+size 15146379
diff --git a/clamav-0.98.5.tar.gz.sig b/clamav-0.98.5.tar.gz.sig
new file mode 100644
index 0000000..306bd30
Binary files /dev/null and b/clamav-0.98.5.tar.gz.sig differ
diff --git a/clamav-updateclamconf b/clamav-updateclamconf
index ba3ded5..4097de5 100644
--- a/clamav-updateclamconf
+++ b/clamav-updateclamconf
@@ -56,25 +56,28 @@ lastname != FILENAME {
     pass++
 }
 # collect options from the first file
-pass == 1 && $0 ~ /^[[:space:]]*[^#]/ {
+pass == 1 && $0 ~ /^[[:space:]]*#?[^[:space:]]/ {
     if (NF == 1) {
 	$2 = "yes"
     }
-    if (!($1 in options)) {
-	options[$1] = $0
+    # copy $1, so that sub() doesn't modify $0
+    o = $1
+    sub("^#", "", o)
+    if (!(o in options)) {
+	options[o] = $0
     }
 }
 # merge options into the content of the second file
 pass == 2 {
     # copy $1, so that sub() doesn't modify $0
     o = $1
-    sub("^#", "", o)
+    sub("^[[:space:]]*#", "", o)
     if (o in options) {
-        if (o == "NotifyClamd" && options[o] ~ / yes$/) {
-            sub("^#", "")  
-            options[o] = $0
+        if (options[o] ~ /^[[:space:]]*#/ && $0 ~ /^[[:space:]]*#/) {
+            print
+        } else {
+            print options[o] 
         }
-        print options[o] 
         delete options[o]
     } else { 
         print
@@ -85,7 +88,7 @@ END {
     for (o in options) {
 	print "\n# These options weren't found in the new config file"
 	for (o in options) {
-	    print "# " o, options[o]
+	    print "# " options[o]
 	}
 	break
     }
diff --git a/clamav.changes b/clamav.changes
index a537c2b..afc67b5 100644
--- a/clamav.changes
+++ b/clamav.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Wed Nov 19 14:54:58 UTC 2014 - max@suse.com
+
+- Version 0.98.5:
+  * Support for the XDP file format and extracting, decoding, and
+    scanning PDF files within XDP files.
+  * Addition of shared library support for LLVM versions 3.1 - 3.5
+    for the purpose of just-in-time(JIT) compilation of ClamAV
+    bytecode signatures.
+  * Enhancements to the clambc command line utility to assist
+    ClamAV bytecode signature authors by providing introspection
+    into compiled bytecode programs.
+  * Resolution of many of the warning messages from ClamAV
+    compilation.
+  * Improved detection of malicious PE files.
+  * Security fix for ClamAV crash when using 'clamscan -a'.
+  * Security fix for ClamAV crash when scanning maliciously
+    crafted yoda's crypter files (bnc#906077, CVE-2013-6497).
+  * ClamAV 0.98.5 now works with OpenSSL in FIPS compliant
+    mode (bnc#904207).
+  * Fix server socket setup code in clamd (bnc#903489).
+- Change updateclamconf to prefer the state of the old config
+  file even for commented-out options (bnc#903719).
+
 -------------------------------------------------------------------
 Sun Nov 09 02:31:00 UTC 2014 - Led <ledest@gmail.com>
 
diff --git a/clamav.spec b/clamav.spec
index e0a9aec..2d259e8 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -49,7 +49,7 @@ BuildRequires:  bzip2
 Summary:        Antivirus Toolkit
 License:        GPL-2.0
 Group:          Productivity/Security
-Version:        0.98.4
+Version:        0.98.5
 Release:        0
 Url:            http://www.clamav.net
 Requires:       latex2html-pngicons