diff --git a/.cvsignore b/.cvsignore
index 16f4aa3..0061419 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-scrub-2.1.tar.bz2
+scrub-2.2.tar.bz2
diff --git a/scrub.spec b/scrub.spec
index 1fe886a..159d9a0 100644
--- a/scrub.spec
+++ b/scrub.spec
@@ -1,12 +1,11 @@
 Name:		scrub
-Version:	2.1
-Release:	3%{?dist}
+Version:	2.2
+Release:	1%{?dist}
 Summary:	Disk scrubbing program
 License:	GPLv2+
 Group:		System Environment/Base
-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)
+URL:		http://code.google.com/p/diskscrub/
+Source0:	http://diskscrub.googlecode.com/files/%{name}-%{version}.tar.bz2
 
 %description
 Scrub writes patterns on files or disk devices to make
@@ -25,11 +24,7 @@ the file system is full, then scrubbed as in 2).
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} install
 
 %files
 %defattr(-,root,root)
@@ -38,6 +33,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/scrub.1*
 
 %changelog
+* Tue Jun 29 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.2-1
+- update to 2.2, new url, source location
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 3b323c2..2924dc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a72e6c68c4dd5ada565bb4edb7b4101  scrub-2.1.tar.bz2
+1796abff2cd82243fcd8c757e37c9299  scrub-2.2.tar.bz2