diff --git a/.gitignore b/.gitignore
index a26f483..4ddbb6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ cscope-15.5.tar.gz
 cscope-15.5-inverted.patch
 cscope-15.6.tar.gz
 cscope-15.7a.tar.bz2
+/cscope-15.8.tar.bz2
diff --git a/cscope.spec b/cscope.spec
index 26cbb85..9a702e6 100644
--- a/cscope.spec
+++ b/cscope.spec
@@ -1,8 +1,8 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
-Version: 15.7a
-Release: 10%{?dist}
-Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.7a.tar.bz2
+Version: 15.8
+Release: 1%{?dist}
+Source0: https://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
 URL: http://cscope.sourceforge.net
 License: BSD and GPLv2+
 Group: Development/Tools 
@@ -15,14 +15,6 @@ Requires: emacs-filesystem xemacs-filesystem
 %define emacs_lisp_path %{_datadir}/emacs/site-lisp
 %define vim_plugin_path %{_datadir}/vim/vimfiles/plugin
 
-Patch0:cscope-15.6-findassign.patch
-Patch1:cscope-15.6-ocs.patch
-Patch2:cscope-15.6-xcscope-man.patch
-Patch3:cscope-15.7-sig_pipe.patch
-Patch4:cscope-15.7a-add-cctree.patch
-Patch5:cscope-15.7a-lexerr.patch
-Patch6:cscope-invlib-overflow.patch
-
 %description
 cscope is a mature, ncurses based, C source code tree browsing tool.  It 
 allows users to search large source code bases for variables, functions,
@@ -32,13 +24,6 @@ matches for use in file editing.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 %configure
@@ -95,6 +80,9 @@ rm -f %{emacs_lisp_path}/xcscope.el
 rm -f %{vim_plugin_path}/cctree.vim
 
 %changelog
+* Mon Jun 18 2012 Neil Horman <nhorman@redhat.com> - 15.8
+- Update to latest upstream
+
 * Mon Mar 12 2012 Neil Horman <nhorman@redhat.com> -15.7a-10
 - Fixed a segfault in invlib construction ( bz 786523)
 
diff --git a/sources b/sources
index d6fea78..ed885ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da43987622ace8c36bbf14c15a350ec1  cscope-15.7a.tar.bz2
+7114b5838b3edcb3f5821efd444fff06  cscope-15.8.tar.bz2