diff --git a/.cvsignore b/.cvsignore
index 6b54338..edea83c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Tie-IxHash-1.21.tar.gz
+Tie-IxHash-1.22.tar.gz
diff --git a/Tie-IxHash-1.22-Makefile.patch b/Tie-IxHash-1.22-Makefile.patch
new file mode 100644
index 0000000..1b22461
--- /dev/null
+++ b/Tie-IxHash-1.22-Makefile.patch
@@ -0,0 +1,10 @@
+--- Tie-IxHash-1.22/Makefile.PL	2010-02-19 22:53:29.000000000 +0000
++++ Tie-IxHash-1.22/Makefile.PL	2010-03-03 15:32:17.269325632 +0000
+@@ -9,6 +9,7 @@
+       repository => 'git://github.com/chorny/Tie-IxHash.git',
+     },
+   },
++  PL_FILES => {},
+   #SKIP => [qw(static dynamic)],
+   #'linkext' => {LINKTYPE => '' },
+   #'dist' => {COMPRESS=>'gzip -9f', SUFFIX => 'gz'},
diff --git a/perl-Tie-IxHash.spec b/perl-Tie-IxHash.spec
index 9f2319f..b75d587 100644
--- a/perl-Tie-IxHash.spec
+++ b/perl-Tie-IxHash.spec
@@ -1,16 +1,17 @@
 Name:           perl-Tie-IxHash
-Version:        1.21
-Release:        11%{?dist}
+Version:        1.22
+Release:        1%{?dist}
 Summary:        Ordered associative arrays for Perl
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Tie-IxHash/
-Source0:        http://www.cpan.org/authors/id/G/GS/GSAR/Tie-IxHash-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/Tie-IxHash-%{version}.tar.gz
+Patch0:         Tie-IxHash-1.22-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::More), perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -23,7 +24,12 @@ familiar perl array operations can also be performed on the IxHash.
 
 %prep
 %setup -q -n Tie-IxHash-%{version}
-chmod -c 644 Changes README
+
+# Fix Makefile.PL to work with old ExtUtils::MakeMaker versions
+%patch0 -p1
+
+# Fix line endings
+sed -i -e 's/\r$//' Changes README
 
 
 %build
@@ -35,7 +41,7 @@ make %{?_smp_mflags}
 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 ';'
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} ';' 2>/dev/null
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
@@ -55,8 +61,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar  3 2010 Paul Howarth <paul@city-fan.org> - 1.22-1
+- Update to 1.22 (modernize distribution)
+- BR: perl(Test::More), perl(Test::Pod)
+- Fix Makefile.PL to work with old ExtUtils::MakeMaker versions
+- Fix argument order for find with -depth
+
 * Fri Dec  4 2009 Stepan Kasal <skasal@redhat.com> - 1.21-11
-- rebuild against perl 5.10.1
+- Rebuild against perl 5.10.1
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.21-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -68,11 +80,11 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuild for perl 5.10 (again)
 
 * Mon Jan 28 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.21-7
-- rebuild for new perl
+- Rebuild for new perl
 
 * Wed Oct 17 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 1.21-6.1
-- correct license tag
-- add BR: perl(ExtUtils::MakeMaker)
+- Correct license tag
+- Add BR: perl(ExtUtils::MakeMaker)
 
 * Thu Sep  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.21-6
 - Rebuild for FC6.
@@ -84,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT
 - Dist tag.
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.21-3
-- rebuilt
+- Rebuilt
 
 * Sun May  9 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.21-0.fdr.2
 - Avoid creation of the perllocal.pod file (make pure_install).
diff --git a/sources b/sources
index cee8393..9c86543 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-567ddc13081596b52cfe3d82218cb264  Tie-IxHash-1.21.tar.gz
+aae2e62df7e016fd3e8fdaaea71b0b41  Tie-IxHash-1.22.tar.gz