diff --git a/.gitignore b/.gitignore
index 9553a2b..ff6e63f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 CSS-Tiny-1.15.tar.gz
+/CSS-Tiny-1.18.tar.gz
diff --git a/perl-CSS-Tiny.spec b/perl-CSS-Tiny.spec
index 35574cb..5f0491e 100644
--- a/perl-CSS-Tiny.spec
+++ b/perl-CSS-Tiny.spec
@@ -1,16 +1,17 @@
 Name:           perl-CSS-Tiny
-Version:        1.15
-Release:        8%{?dist}
+Version:        1.18
+Release:        1%{?dist}
 Summary:        Read/Write .css files with as little code as possible
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/CSS-Tiny/
 Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/CSS-Tiny-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(Clone)
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod) >= 1.00
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Clone)
@@ -30,7 +31,6 @@ 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 ';'
@@ -41,18 +41,17 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 make test
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc Changes LICENSE README
 %{perl_vendorlib}/CSS/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sun Oct 02 2011 Iain Arnell <iarnell@gmail.com> 1.18-1
+- update to latest upstream version
+- clean up spec for modern rpmbuild
+
 * Mon Jun 20 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.15-8
 - Perl mass rebuild
 
diff --git a/sources b/sources
index 29f1ee0..3ac66ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb95eca695af24221f34de116a069b73  CSS-Tiny-1.15.tar.gz
+f9a294ee9daf23eb0c11e96b7c4cd157  CSS-Tiny-1.18.tar.gz