diff --git a/cdparanoia-III-10.0-headers.patch b/cdparanoia-III-10.0-headers.patch
new file mode 100644
index 0000000..d29e88d
--- /dev/null
+++ b/cdparanoia-III-10.0-headers.patch
@@ -0,0 +1,12 @@
+diff -up cdparanoia-III-10.0/header.c.headers cdparanoia-III-10.0/header.c
+diff -up cdparanoia-III-10.0/paranoia/gap.c.headers cdparanoia-III-10.0/paranoia/gap.c
+--- cdparanoia-III-10.0/paranoia/gap.c.headers	2008-05-12 17:20:49.000000000 -0400
++++ cdparanoia-III-10.0/paranoia/gap.c	2008-07-15 10:24:21.000000000 -0400
+@@ -9,6 +9,7 @@
+ #include "p_block.h"
+ #include "cdda_paranoia.h"
+ #include "gap.h"
++#include <string.h>
+ 
+ /**** Gap analysis code ***************************************************/
+ 
diff --git a/cdparanoia-III-alpha9.8.scsi-setspeed.patch b/cdparanoia-III-alpha9.8.scsi-setspeed.patch
index b5e2585..bdea55b 100644
--- a/cdparanoia-III-alpha9.8.scsi-setspeed.patch
+++ b/cdparanoia-III-alpha9.8.scsi-setspeed.patch
@@ -1,7 +1,8 @@
---- cdparanoia-III-alpha9.8/interface/scsi_interface.c_orig	2008-02-02 21:14:07.000000000 +0100
-+++ cdparanoia-III-alpha9.8/interface/scsi_interface.c	2008-02-02 21:13:41.000000000 +0100
-@@ -1565,6 +1565,15 @@
-   return ret;
+diff -up cdparanoia-III-10.0/interface/scsi_interface.c.setspeed cdparanoia-III-10.0/interface/scsi_interface.c
+--- cdparanoia-III-10.0/interface/scsi_interface.c.setspeed	2008-05-14 14:59:15.000000000 -0400
++++ cdparanoia-III-10.0/interface/scsi_interface.c	2008-07-15 10:23:42.000000000 -0400
+@@ -1616,6 +1616,14 @@ unsigned char *scsi_inquiry(cdrom_drive 
+   return (d->sg_buffer);
  }
  
 +/* Set operating speed */
@@ -12,11 +13,10 @@
 +  else
 +    return 0;
 +}
-+
- int scsi_init_drive(cdrom_drive *d){
-   int ret, is_sgio;
  
-@@ -1609,7 +1618,7 @@
+ int scsi_init_drive(cdrom_drive *d){
+   int ret;
+@@ -1660,7 +1668,7 @@ int scsi_init_drive(cdrom_drive *d){
  
    d->read_toc = (!memcmp(d->drive_model, "IMS", 3) && !d->is_atapi) ? scsi_read_toc2 : 
      scsi_read_toc;
diff --git a/cdparanoia.spec b/cdparanoia.spec
index 6f60253..37e5849 100644
--- a/cdparanoia.spec
+++ b/cdparanoia.spec
@@ -2,8 +2,8 @@
 
 Name: cdparanoia
 Version: 10.0
-Release: 2%{?dist}
-License: GPL
+Release: 3%{?dist}
+License: GPLv3
 Group: Applications/Multimedia
 Source: http://downloads.xiph.org/releases/%{name}/%{name}-III-%{version}.src.tgz
 Patch0: cdparanoia-III-alpha9.8.nostrip.patch
@@ -18,7 +18,7 @@ Patch8: cdparanoia-III-alpha9.8.env.patch
 Patch9: cdparanoia-III-alpha9.8.smalldma.patch
 Patch10: cdparanoia-III-alpha9.8.lm.patch
 Patch11: cdparanoia-III-alpha9.8.scsi-setspeed.patch
-Patch12: cdparanoia-III-alpha9.8-headers.patch
+Patch12: cdparanoia-III-10.0-headers.patch
 Url: http://www.xiph.org/paranoia/index.html
 BuildRoot: %{_tmppath}/cdparanoia-%{version}-root
 Requires: cdparanoia-libs = %{version}-%{release}
@@ -39,6 +39,8 @@ damaged CDs.
 Summary: Development tools for libcdda_paranoia (Paranoia III).
 Group: Development/Libraries
 Requires: cdparanoia-libs = %{version}-%{release}
+# Some of the headers are LGPLv3
+License: GPLv3 and LGPLv3
 
 %description -n cdparanoia-devel
 The cdparanoia-devel package contains the static libraries and header
@@ -47,6 +49,7 @@ files needed for developing applications to read CD Digital Audio disks.
 %package -n cdparanoia-libs
 Summary: Libraries for libcdda_paranoia (Paranoia III).
 Group: Development/Libraries
+License: GPLv3
 
 %description -n cdparanoia-libs
 The cdparanoia-libs package contains the dynamic libraries needed for
@@ -125,6 +128,10 @@ fi
 %{_libdir}/*.a
 
 %changelog
+* Tue Jul 15 2008 Tom "spot" Callaway <tcallawa@redhat.com> 10.0-3
+- fix license tag
+- fix headers, setspeed patch to apply with fuzz=0
+
 * Thu Jun 19 2008 Adam Jackson <ajax@redhat.com> 10.0-2
 - cdparanoia 10.