diff --git a/cscope-15.8a.tar.gz b/cscope-15.8a.tar.gz
deleted file mode 100644
index 1068010..0000000
--- a/cscope-15.8a.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb736ac40d5abebe8fa46820c7a8eccc8a17966a9a5f70375367b77177874d1e
-size 601232
diff --git a/cscope-15.8b.tar.gz b/cscope-15.8b.tar.gz
new file mode 100644
index 0000000..2f082c8
--- /dev/null
+++ b/cscope-15.8b.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4889d091f05aa0845384b1e4965aa31d2b20911fb2c001b2cdcffbcb7212d3af
+size 613187
diff --git a/cscope-egrep.out.patch b/cscope-egrep.out.patch
index 20899eb..d43aa3b 100644
--- a/cscope-egrep.out.patch
+++ b/cscope-egrep.out.patch
@@ -4,12 +4,12 @@
 #
 --- cscope-15.7a/src/egrep.y	2008-03-12 15:43:56.000000000 -0500
 +++ cscope-15.7a.orig/src/egrep.y	2011-06-09 15:32:08.809669622 -0500
-@@ -592,12 +592,22 @@ egrep(char *file, FILE *output, char *fo
+@@ -612,12 +612,22 @@
  		succeed:
  		    fprintf(output, format, file, lnum);
  		    if (p <= nlp) {
--			while (nlp < &buf[2*BUFSIZ])
-+			while (nlp < &buf[2*BUFSIZ]) {
+-			while (nlp < buf_end)
++			while (nlp < buf_end) {
 +			    if ('\r' == *nlp) {
 +				nlp++;
 +				continue;
@@ -25,7 +25,7 @@
 +			    continue;
 +			}
  			putc(*nlp++, output);
-+		    }
++			}
  		    lnum++;
  		    nlp = p;
- 		    if ((out[(cstat=istat)]) == 0)
+ 		    if (out[cstat = istat] == 0)
diff --git a/cscope.changes b/cscope.changes
index 9c8ef28..dd33b48 100644
--- a/cscope.changes
+++ b/cscope.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Jan  2 23:03:49 UTC 2016 - p.drouand@gmail.com
+
+- Update to version 15.8b
+  * configure.in: Add check to enable C system extensions (like
+    _GNU_SOURCE), if available.
+  * contrib/cctree.txt: Format change: file had DOS line endings for
+    some reason.
+- Adapt cscope-egrep.out.patch to upstream changes
+
 -------------------------------------------------------------------
 Thu Apr  2 17:36:01 UTC 2015 - mpluskal@suse.com
 
diff --git a/cscope.spec b/cscope.spec
index 4a86419..1595400 100644
--- a/cscope.spec
+++ b/cscope.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cscope
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           cscope
-Version:        15.8a
+Version:        15.8b
 Release:        0
 Summary:        Interactive Tool for Browsing C Source Code
 License:        BSD-3-Clause