diff --git a/.cvsignore b/.cvsignore
index 3451bbd..7b92391 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pciutils-2.1.99-test7.tar.gz
+pciutils-2.1.99-test8.tar.gz
diff --git a/pciutils-havepread.patch b/pciutils-havepread.patch
index cd5c2ab..56fbff3 100644
--- a/pciutils-havepread.patch
+++ b/pciutils-havepread.patch
@@ -1,15 +1,9 @@
---- pciutils-2.1.99-test3/lib/pread.h.pread	2004-02-25 01:51:55.369843832 -0500
-+++ pciutils-2.1.99-test3/lib/pread.h	2004-02-25 01:52:01.405065807 -0500
-@@ -6,60 +6,6 @@
-  *	Can be freely distributed and used under the terms of the GNU GPL.
+--- pciutils-2.1.99-test8/lib/pread.h.pread	2004-08-13 16:15:46.000000000 -0400
++++ pciutils-2.1.99-test8/lib/pread.h	2004-08-31 00:30:03.168157294 -0400
+@@ -12,54 +12,6 @@
+  *  don't define it.
   */
  
--/*
-- *  We'd like to use pread/pwrite for configuration space accesses, but
-- *  unfortunately it isn't simple at all since all libc's until glibc 2.1
-- *  don't define it.
-- */
--
 -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0
 -/* glibc 2.1 or newer -> pread/pwrite supported automatically */
 -
@@ -35,7 +29,7 @@
 -static _syscall5(int, pwrite, unsigned int, fd, void *, buf, size_t, size, u32, where_lo, u32, where_hi);
 -static int do_read(struct pci_dev *d UNUSED, int fd, void *buf, size_t size, int where) { return pread(fd, buf, size, where, 0); }
 -static int do_write(struct pci_dev *d UNUSED, int fd, void *buf, size_t size, int where) { return pwrite(fd, buf, size, where, 0); }
--#define HAVE_DO_READ
+-#define PCI_HAVE_DO_READ
 -
 -#else
 -/* In all other cases we use lseek/read/write instead to be safe */
@@ -55,9 +49,9 @@
 -	}
 -make_rw_glue(read)
 -make_rw_glue(write)
--#define HAVE_DO_READ
+-#define PCI_HAVE_DO_READ
 -#endif
 -
- #ifndef HAVE_DO_READ
+ #ifndef PCI_HAVE_DO_READ
  #define do_read(d,f,b,l,p) pread(f,b,l,p)
  #define do_write(d,f,b,l,p) pwrite(f,b,l,p)
diff --git a/pciutils.spec b/pciutils.spec
index 3a3db56..3fe8e73 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,12 +1,14 @@
+%define testversion test8
+
 Name:		pciutils
-Version:	2.1.99.test7
+Version:	2.1.99.%{testversion}
 Release:	1
-Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/alpha/%{name}-2.1.99-test7.tar.gz
+Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/alpha/%{name}-2.1.99-%{testversion}.tar.gz
 Patch0:		pciutils-strip.patch
 Patch1:		pciutils-pciids.patch
 Patch2:		pciutils-2.1.10-scan.patch
 Patch3: 	pciutils-havepread.patch
-Patch4:		pciutils-error.patch
+Patch4:		pciutils-typo.patch
 License:	GPL
 Buildroot: 	%{_tmppath}/%{name}-%{version}-root
 ExclusiveOS: 	Linux
@@ -32,12 +34,12 @@ This package contains a library for inspecting and setting
 devices connected to the PCI bus.
 
 %prep
-%setup -q -n pciutils-2.1.99-test7
+%setup -q -n pciutils-2.1.99-%{testversion}
 %patch0 -p1 -b .strip
 %patch1 -p1 -b .pciids
 %patch2 -p1 -b .scan
 %patch3 -p1 -b .pread
-%patch4 -p1 -b .error
+%patch4 -p1 -b .typo
 
 %build
 %ifarch i386
@@ -81,6 +83,9 @@ install lib/libpci_loader_a $RPM_BUILD_ROOT%{_libdir}/libpci_loader.a
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Aug 31 2004 Bill Nottingham <notting@redhat.com> 2.1.99.test8-1
+- update to test8
+
 * Fri Jul  9 2004 Bill Nottingham <notting@redhat.com> 2.1.99.test7-1
 - update to test7
 - fix segfault on some x86-64 boxen
diff --git a/sources b/sources
index ca24299..553af24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3b5d7780c76d5f078a23d984db2bdb8  pciutils-2.1.99-test7.tar.gz
+d7ee9453cb67c32bf99f74bcbdd5d132  pciutils-2.1.99-test8.tar.gz