diff --git a/.gitignore b/.gitignore
index 1a85018..87548a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-Perl6-Junction-1.40000.tar.gz
+/Perl6-Junction-[0-9.]*.tar.gz
diff --git a/perl-Perl6-Junction.spec b/perl-Perl6-Junction.spec
index 2bfdeb1..5d1f22c 100644
--- a/perl-Perl6-Junction.spec
+++ b/perl-Perl6-Junction.spec
@@ -1,24 +1,21 @@
-%define tarname Perl6-Junction
-Name:           perl-Perl6-Junction
-Version:        1.40000
-Release:        3%{?dist}
-Summary:        Perl6 style Junction operators in Perl5
-
-Group:          Development/Libraries
-License:        GPL+ or Artistic
-URL:            http://search.cpan.org/dist/Perl6-Junction/
-Source0:        http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/%{tarname}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:      noarch
-# Correct for lots of packages, other common choices include eg. Module::Build
-BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Name:		perl-Perl6-Junction
+Version:	1.40000
+Release:	4%{?dist}
+Summary:	Perl6 style Junction operators in Perl5
+Group:		Development/Libraries
+License:	GPL+ or Artistic
+URL:		http://search.cpan.org/dist/Perl6-Junction/
+Source0:	http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/Perl6-Junction-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
+BuildArch:	noarch
+BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(Test::More)
+Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 Perl6 style Junction operators in Perl5.
 
-This is a lightweight module which provides 'Junction' operators, the most 
+This is a lightweight module that provides 'Junction' operators, the most 
 commonly used being 'any' and 'all'.
 
 Inspired by the Perl6 design docs, 
@@ -29,49 +26,42 @@ Provides a limited subset of the functionality of L<Quantum::Superpositions>.
 %prep
 %setup -q -n Perl6-Junction-%{version}
 
+# Fix line endings
+sed -i -e 's/\r$//' Changes
 
 %build
-# Remove OPTIMIZE=... from noarch packages (unneeded)
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+perl Makefile.PL INSTALLDIRS=vendor
 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 {} ';'
-# Remove the next line from noarch packages (unneeded)
-find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+rm -rf %{buildroot}
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
+%{_fixperms} %{buildroot}
 
 %check
 make test
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc
-# For noarch packages: vendorlib
-%{perl_vendorlib}/*
-# For arch-specific packages: vendorarch
-#%{perl_vendorarch}/*
-#%exclude %dir %{perl_vendorarch}/auto/
-%{_mandir}/man3/*.3*
-
+%doc Changes README
+%{perl_vendorlib}/Perl6/
+%{_mandir}/man3/Perl6::Junction.3pm*
 
 %changelog
+* Mon Sep 19 2011 Paul Howarth <paul@city-fan.org> - 1.40000-4
+- General tidy-up of spec file, removing redundant bits and packaging some
+  upstream documentation
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.40000-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.40000-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-
-* Sun Jan 25 2009 Allisson Azevedo <allisson@gmail.com> 1.40000-1
+* Sun Jan 25 2009 Allisson Azevedo <allisson@gmail.com> - 1.40000-1
 - Initial RPM release