diff --git a/needs.rebuild b/needs.rebuild
deleted file mode 100644
index 815fd29..0000000
--- a/needs.rebuild
+++ /dev/null
@@ -1 +0,0 @@
-http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild
diff --git a/perl-IO-stringy.spec b/perl-IO-stringy.spec
index 7383520..def1f2f 100644
--- a/perl-IO-stringy.spec
+++ b/perl-IO-stringy.spec
@@ -1,50 +1,38 @@
-%define		perl_vendorlib	%(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
-
-%define		tarname	IO-stringy
-
 Summary:	I/O on in-core objects like strings and arrays for Perl
-Name:		perl-%{tarname}
+Name:		perl-IO-stringy
 Version:	2.110
 Release:	2
-
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/IO-stringy/
-Source0:	http://www.cpan.org/authors/id/D/DS/DSKOLL/%{tarname}-%{version}.tar.gz
+Source0:	http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/IO-stringy-%{version}.tar.gz
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-
 %description
 This toolkit primarily provides Perl modules for performing both
-traditional and object-oriented i/o) on things *other* than normal
+traditional and object-oriented I/O) on things *other* than normal
 filehandles; in particular, IO::Scalar, IO::ScalarArray, and IO::Lines.
 
-
 %prep
-%setup -q -n %{tarname}-%{version}
-
+%setup -q -n IO-stringy-%{version}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
-
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
-
-
-%check || :
-make test
+%{__rm} -rf %{buildroot}
+%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
+/usr/bin/find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+/usr/bin/find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+%{__chmod} -R u+w %{buildroot}/*
 
+%check
+%{__make} test
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -52,8 +40,13 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/IO/
 %{_mandir}/man3/IO::*.3pm*
 
-
 %changelog
+* Tue Aug 29 2006 Paul Howarth <paul@city-fan.org> 2.110-2
+- use search.cpan.org download URL
+- use full paths for all commands used in build
+- assume rpm knows about %%check and %%{perl_vendorlib}
+- cosmetic spec file changes
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt