diff --git a/.cvsignore b/.cvsignore
index d9dff73..5b40421 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-IO-stringy-2.109.tar.gz
+IO-stringy-2.110.tar.gz
diff --git a/perl-IO-stringy.spec b/perl-IO-stringy.spec
index 7d15751..b0ba0c5 100644
--- a/perl-IO-stringy.spec
+++ b/perl-IO-stringy.spec
@@ -1,23 +1,23 @@
-%define		perl_vendorlib	%(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
+%define		perl_vendorlib	%(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
 
 %define		tarname	IO-stringy
 
-Summary: 	I/O on in-core objects like strings and arrays
+Summary: 	I/O on in-core objects like strings and arrays for Perl
 Name: 		perl-%{tarname}
-Version: 	2.109
+Version: 	2.110
 Release: 	1
 Epoch: 		0
 License: 	Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/IO-stringy/
-Source0: 	%{tarname}-%{version}.tar.gz
+Source0: 	http://www.cpan.org/authors/id/D/DS/DSKOLL/%{tarname}-%{version}.tar.gz
 BuildArch:	noarch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 # -----------------------------------------------------------------------------
 
 %description
-This toolkit primarily provides modules for performing both
+This toolkit primarily provides Perl modules for performing both
 traditional and object-oriented i/o) on things *other* than normal
 filehandles; in particular, IO::Scalar, IO::ScalarArray, and IO::Lines.
 
@@ -29,20 +29,22 @@ filehandles; in particular, IO::Scalar, IO::ScalarArray, and IO::Lines.
 # -----------------------------------------------------------------------------
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
-make test
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 # -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+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
 
 # -----------------------------------------------------------------------------
 
@@ -53,29 +55,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING docs examples
-%exclude %{perl_vendorlib}/IO/Scalar.pm.html
-%dir %{perl_vendorlib}/IO
-%{perl_vendorlib}/IO/AtomicFile.pm
-%{perl_vendorlib}/IO/InnerFile.pm
-%{perl_vendorlib}/IO/Lines.pm
-%{perl_vendorlib}/IO/Scalar.pm
-%{perl_vendorlib}/IO/ScalarArray.pm
-%{perl_vendorlib}/IO/Stringy.pm
-%{perl_vendorlib}/IO/Wrap.pm
-%{perl_vendorlib}/IO/WrapTie.pm
-%{_mandir}/man3/IO::AtomicFile.3pm*
-%{_mandir}/man3/IO::InnerFile.3pm*
-%{_mandir}/man3/IO::Lines.3pm*
-%{_mandir}/man3/IO::Scalar.3pm*
-%{_mandir}/man3/IO::ScalarArray.3pm*
-%{_mandir}/man3/IO::Stringy.3pm*
-%{_mandir}/man3/IO::Wrap.3pm*
-%{_mandir}/man3/IO::WrapTie.3pm*
+%doc README COPYING examples
+%{perl_vendorlib}/IO/
+%{_mandir}/man3/IO::*.3pm*
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Feb 15 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:2.110-1
+- 2.110.
+- Some specfile cleanups, bringing it closer to spectemplate-perl.spec.
+
 * Wed Dec 31 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.109-0.fdr.1
 - Update to 2.109.
 
diff --git a/sources b/sources
index 87fd60e..0fd1b2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb8fbb8037bcc2aa0b9abec675231544  IO-stringy-2.109.tar.gz
+2e6a976cfa5521e815c1fdf4006982de  IO-stringy-2.110.tar.gz