diff --git a/.cvsignore b/.cvsignore
index cbcbd3e..a8adbeb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-ethtool-1.8.tar.gz
+ethtool-3
+ethtool-3.tar.gz
diff --git a/ethtool.spec b/ethtool.spec
index b8943a4..22e0266 100644
--- a/ethtool.spec
+++ b/ethtool.spec
@@ -1,12 +1,11 @@
 Summary: Ethernet settings tool for PCI ethernet cards
 Name: ethtool
-Version: 1.8
-Release: 5
+Version: 3
+Release: 1
 License: GPL
 Group: Applications/System
 URL: http://sourceforge.net/projects/gkernel/
-Patch: ethtool-1.8-dev.patch
-Source: http://download.sourceforge.net/gkernel/%{name}-%{version}.tar.gz
+Source0: http://download.sourceforge.net/gkernel/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %define _sbindir	/sbin
@@ -18,20 +17,19 @@ and PCI locations.
 
 %prep
 %setup -q
-%patch -p1
 
 %build
 %configure
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %makeinstall
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-ln -s /sbin/ethtool $RPM_BUILD_ROOT/usr/sbin
+mkdir -p %{buildroot}/usr/sbin
+ln -s /sbin/ethtool %{buildroot}/usr/sbin
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -41,6 +39,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/ethtool.*
 
 %changelog
+* Thu Mar  3 2005 Jeff Garzik <jgarzik@pobox.com>
+- Update to version 3.
+- Use %%buildroot macro, rather than RPM_BUILD_ROOT env var,
+  as recommended by RPM packaging guidelines.
+
 * Sun Feb 27 2005 Florian La Roche <laroche@redhat.com>
 - Copyright: -> License
 
diff --git a/sources b/sources
index 3a95501..b5947e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03236fc7329152f69b2d542b0825e3b4  ethtool-1.8.tar.gz
+b4e71f7fa2629250677eefcb338442c5  ethtool-3.tar.gz