diff --git a/.cvsignore b/.cvsignore
index 7bd814f..c573125 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-usbutils-0.73.tar.gz
+usbutils-0.82.tar.gz
diff --git a/sources b/sources
index 25dccf5..e19cc4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88978b4ad891f610620b1b8e5e0f43eb  usbutils-0.73.tar.gz
+6e393cc7423b5d228fa3d34c21481ae4  usbutils-0.82.tar.gz
diff --git a/usbutils.spec b/usbutils.spec
index 6a9c88a..90c9452 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -1,8 +1,7 @@
 Name: usbutils
-Version: 0.73
-Release: 3%{?dist}
+Version: 0.82
+Release: 1%{?dist}
 Source:	http://downloads.sourceforge.net/linux-usb/%{name}-%{version}.tar.gz
-Patch1: usbutils-0.73-hwdata.patch
 URL: http://www.linux-usb.org/
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,7 +19,6 @@ USB bus.
 
 %prep
 %setup -q
-%patch1 -p1 -b .hwdata
 
 %build
 %configure --sbindir=/sbin
@@ -30,21 +28,25 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-# remove unpackaged files from the buildroot
-rm -rf $RPM_BUILD_ROOT%{_libdir}
-rm -rf $RPM_BUILD_ROOT%{_includedir}
+# usb.ids is shipped in hwdata; nuke and adjust .pc file
 rm -f $RPM_BUILD_ROOT%{_datadir}/usb.ids*
+rm -f $RPM_BUILD_ROOT/sbin/update-usbids.sh
+sed -i 's|usbids=/usr/share/usb.ids|usbids=/usr/share/hwdata/usb.ids|' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/usbutils.pc
 
 %files
 %defattr(-,root,root,-)
 %{_mandir}/*/*
 /sbin/*
+%{_libdir}/pkgconfig/usbutils.pc
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri May 22 2009 David Zeuthen <davidz@redhat.com> 0.82-1
+- Update to 0.82
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.73-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild