diff --git a/dev-util/cscope/cscope-15.7a.recipe b/dev-util/cscope/cscope-15.8b.recipe
similarity index 79%
rename from dev-util/cscope/cscope-15.7a.recipe
rename to dev-util/cscope/cscope-15.8b.recipe
index cff65ffce..93a261e79 100644
--- a/dev-util/cscope/cscope-15.7a.recipe
+++ b/dev-util/cscope/cscope-15.8b.recipe
@@ -13,14 +13,14 @@ HOMEPAGE="http://cscope.sourceforge.net/"
 COPYRIGHT="1998-2000 The Santa Cruz Operation"
 LICENSE="BSD (3-clause)"
 REVISION="1"
-SOURCE_URI="http://sourceforge.net/projects/cscope/files/cscope/15.7a/cscope-15.7a.tar.bz2"
-CHECKSUM_SHA256="02638bcba790bc8b0562f28dbe789e61794415079d94a676efc287d18dc96037"
-PATCHES="cscope-15.7a.patch"
+SOURCE_URI="http://sourceforge.net/projects/cscope/files/cscope/$portVersion/cscope-$portVersion.tar.gz"
+CHECKSUM_SHA256="4889d091f05aa0845384b1e4965aa31d2b20911fb2c001b2cdcffbcb7212d3af"
+PATCHES="cscope-$portVersion.patchset"
 
-ARCHITECTURES="x86 x86_gcc2"
+ARCHITECTURES=" x86_gcc2 x86 x86_64"
 
 PROVIDES="
-	cscope = $portVersion compat >= 15
+	cscope = $portVersion
 	cmd:cscope = $portVersion compat >= 15
 	cmd:ocs = $portVersion compat >= 15
 	"
diff --git a/dev-util/cscope/patches/cscope-15.7a.patch b/dev-util/cscope/patches/cscope-15.8b.patchset
similarity index 61%
rename from dev-util/cscope/patches/cscope-15.7a.patch
rename to dev-util/cscope/patches/cscope-15.8b.patchset
index d13c508f4..9cf5bfdeb 100644
--- a/dev-util/cscope/patches/cscope-15.7a.patch
+++ b/dev-util/cscope/patches/cscope-15.8b.patchset
@@ -1,7 +1,14 @@
-diff -ur cscope-15.7a/configure.in cscope-15.7a-haiku/configure.in
---- cscope-15.7a/configure.in	2009-04-30 13:17:34.000000000 -0600
-+++ cscope-15.7a-haiku/configure.in	2009-12-29 02:33:05.000000000 -0700
-@@ -264,6 +264,9 @@
+From 3e88f47a94a2c00a6e47014daf8229bbb1eb910c Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 16 Sep 2017 12:12:10 +0200
+Subject: Haiku patch
+
+
+diff --git a/configure.in b/configure.in
+index 2c16833..07383f1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -263,6 +263,9 @@ AC_DEFUN([AC_SEARCH_NCURSES], [
  
      AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
  
@@ -11,10 +18,11 @@ diff -ur cscope-15.7a/configure.in cscope-15.7a-haiku/configure.in
      dnl
      dnl We couldn't find ncurses, try SysV curses
      dnl
-diff -ur cscope-15.7a/src/main.c cscope-15.7a-haiku/src/main.c
---- cscope-15.7a/src/main.c	2009-04-10 08:36:38.000000000 -0600
-+++ cscope-15.7a-haiku/src/main.c	2009-12-29 02:25:46.000000000 -0700
-@@ -121,7 +121,7 @@
+diff --git a/src/main.c b/src/main.c
+index bb15950..5164b0d 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -126,7 +126,7 @@ static	void	usage(void);
  void	fixkeypad();
  #endif
  
@@ -23,12 +31,15 @@ diff -ur cscope-15.7a/src/main.c cscope-15.7a-haiku/src/main.c
  void 
  sigwinch_handler(int sig, siginfo_t *info, void *unused)
  {
-@@ -402,7 +402,7 @@
+@@ -563,7 +563,7 @@ cscope: Could not create private temp dir %s\n",
+     if (linemode == NO) {
  	signal(SIGINT, SIG_IGN);	/* ignore interrupts */
- 	signal(SIGPIPE, SIG_IGN);/* | command can cause pipe signal */
  
 -#if defined(KEY_RESIZE) && !defined(__DJGPP__)
 +#if defined(KEY_RESIZE) && !defined(__DJGPP__) && !defined(__HAIKU__)
  	winch_action.sa_sigaction = sigwinch_handler;
  	sigemptyset(&winch_action.sa_mask);
  	winch_action.sa_flags = SA_SIGINFO;
+-- 
+2.13.1
+