diff --git a/.cvsignore b/.cvsignore
index 1fdff06..be801f8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Imager-0.57.tar.gz
+Imager-0.58.tar.gz
diff --git a/perl-Imager.spec b/perl-Imager.spec
index 4c43d95..ed0e7e9 100644
--- a/perl-Imager.spec
+++ b/perl-Imager.spec
@@ -1,5 +1,5 @@
 Name:           perl-Imager
-Version:        0.57
+Version:        0.58
 Release:        1%{?dist}
 Summary:        Perl extension for Generating 24 bit Images
 License:        GPL or Artistic
@@ -7,10 +7,12 @@ Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Imager/
 Source0:        http://www.cpan.org/authors/id/T/TO/TONYC/Imager-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  perl(Affix::Infix2Postfix)
 BuildRequires:  perl(ExtUtils::Depends)
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Parse::RecDescent)
+BuildRequires:  perl(Image::Math::Constrain)
 BuildRequires:  perl(Inline)
+BuildRequires:  perl(Parse::RecDescent)
 BuildRequires:  perl(Test::Pod) >= 1.00
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
 BuildRequires:  freetype-devel
@@ -41,10 +43,6 @@ find . -type f -name '*.pm' \
     -exec perl -pi -e '$_=undef if ($.==1 and /^\#\!.*perl/)' {} \;
 chmod a-x samples/*
 
-# Fix path to rgb.txt.
-%{__perl} -pi -e 's,/usr/lib/X11/,/usr/share/X11/,' \
-    lib/Imager/Color.pm t/t15color.t
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
@@ -75,6 +73,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri May 18 2007 Steven Pritchard <steve@kspei.com> 0.58-1
+- Update to 0.58.
+- Drop hack to change location of rgb.txt (fixed upstream).
+- BR Image::Math::Constrain and Affix::Infix2Postfix for better test coverage.
+
 * Tue May 01 2007 Steven Pritchard <steve@kspei.com> 0.57-1
 - Update to 0.57.
 - BR gdbm-devel.
diff --git a/sources b/sources
index 6362226..49ea447 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-293e514b499c769133ac916d70acacea  Imager-0.57.tar.gz
+c953f53b2680a67dfbef743e77a230b0  Imager-0.58.tar.gz