diff --git a/.cvsignore b/.cvsignore
index 0b1d8ea..c30ae1b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-libcdio-0.79.tar.gz.sig
-libcdio-0.79.tar.gz
+libcdio-0.80.tar.gz
+libcdio-0.80.tar.gz.sig
diff --git a/libcdio.spec b/libcdio.spec
index 2288097..b9fe508 100644
--- a/libcdio.spec
+++ b/libcdio.spec
@@ -1,19 +1,16 @@
-Name:           libcdio
-Version:        0.79
-Release:        3%{?dist}
-Summary:        CD-ROM input and control library
-
-Group:          Applications/Multimedia
-License:        GPLv2+
-URL:            http://www.gnu.org/software/libcdio/
-Source0:        http://ftp.gnu.org/gnu/libcdio/libcdio-0.79.tar.gz
-Source1:        http://ftp.gnu.org/gnu/libcdio/libcdio-0.79.tar.gz.sig
-Source2:        libcdio-no_date_footer.hml
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:         libcdio-info-buffer.patch
-Patch1:         libcdio-0.79-gcc43.patch
-BuildRequires:  pkgconfig doxygen
-BuildRequires:  ncurses-devel
+Name: libcdio
+Version: 0.80
+Release: 1%{?dist}
+Summary: CD-ROM input and control library
+Group: System Environment/Libraries
+License: GPLv2+
+URL: http://www.gnu.org/software/libcdio/
+Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.80.tar.gz
+Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.80.tar.gz.sig
+Source2: libcdio-no_date_footer.hml
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: pkgconfig doxygen
+BuildRequires: ncurses-devel
 Requires(post): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -35,8 +32,6 @@ This package contains header files and static libraries for %{name}.
 
 %prep
 %setup -q
-%patch0 -p3
-%patch1 -p1
 f=src/cd-paranoia/doc/ja/cd-paranoia.1.in
 iconv -f euc-jp -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
 
@@ -71,7 +66,9 @@ cp -a example/C++/{*.cpp,README} examples/C++
 
 %check || :
 # disable test using local CDROM
-%{__sed} -i -e  "s,testiso9660\$(EXEEXT),,g" test/Makefile
+%{__sed} -i -e  "s,testiso9660\$(EXEEXT),,g" \
+            -e "s,check_paranoia.sh check_opts.sh, check_opts.sh,g" \
+            test/Makefile
 make check
 
 
@@ -113,6 +110,11 @@ fi
 
 
 %changelog
+* Thu May 29 2008 Adrian Reber <adrian@lisas.de> - 0.80-1
+- updated to 0.80
+- removed upstreamed patches
+- last GPLv2+ release
+
 * Thu Feb 14 2008 Adrian Reber <adrian@lisas.de> - 0.79-3
 - added patch to compile with gcc43
 
diff --git a/sources b/sources
index fe76cae..b80a947 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-782b60915596f78bfabdf8fa1a6f89d0  libcdio-0.79.tar.gz.sig
-0ec00a5b8b119aab6268dd2d294f215e  libcdio-0.79.tar.gz
+6495add276ed11b7ac8a88092799ab4f  libcdio-0.80.tar.gz
+8eb4a8d3d1bb1ceec336863980171c8c  libcdio-0.80.tar.gz.sig