diff --git a/.cvsignore b/.cvsignore
index 0ffb841..1c6cbb9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 scrub-1.6-1.tgz
+scrub-1.7.tar.bz2
diff --git a/scrub.spec b/scrub.spec
index b707da5..ce1692a 100644
--- a/scrub.spec
+++ b/scrub.spec
@@ -1,18 +1,21 @@
 Name:		scrub
-Version:	1.6
-Release:	3%{?dist}
+Version:	1.7
+Release:	1%{?dist}
 Summary:	Disk scrubbing program
 License:	GPL
 Group:		System Environment/Base
-URL:		http://www.llnl.gov/linux/scrub/scrub.html	
-Source0:	ftp://ftp.llnl.gov/pub/linux/scrub/%{name}-%{version}-1.tgz
+URL:		http://sourceforge.net/projects/diskscrub/
+Source0:	http://download.sourceforge.net/diskscrub/scrub-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Scrub writes patterns on special files (i.e. raw disk devices) or
-regular files to reduce the possibility of someone retrieving the
-data. There are up to six passes, each of which fills the disk
-with a particular pattern.
+Scrub writes patterns on files or disk devices to make
+retrieving the data more difficult.  It operates in one of three
+modes: 1) the special file corresponding to an entire disk is scrubbed
+and all data on it is destroyed;  2) a regular file is scrubbed and
+only the data in the file (and optionally its name in the directory
+entry) is destroyed; or 3) a regular file is created, expanded until
+the file system is full, then scrubbed as in 2).
 
 %prep
 %setup -q
@@ -35,6 +38,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/scrub.1*
 
 %changelog
+* Mon Feb 20 2006 Tom "spot" Callaway <tcallawa@redhat.com> 1.7-1
+- bump to 1.7, update URL, Source0
+- use Ben Woodard's description
+
 * Sat May 21 2005 Tom "spot" Callaway <tcallawa@redhat.com> 1.6-2
 - cleanups
 
diff --git a/sources b/sources
index f9f6597..e41506d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63b8a3d4d9c6bc1b172af5890dd8cec1  scrub-1.6-1.tgz
+faf66a307afbd06d57f617fa3176870f  scrub-1.7.tar.bz2