diff --git a/.cvsignore b/.cvsignore
index cb0b15d..3042d54 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Image-Info-1.17.tar.gz
+Image-Info-1.19.tar.gz
diff --git a/Image-Info-1.16-XBM.pm.patch b/Image-Info-1.16-XBM.pm.patch
deleted file mode 100644
index fea9e2c..0000000
--- a/Image-Info-1.16-XBM.pm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN Image-Info-1.16/lib/Image/Info/XBM.pm Image-Info-1.16-patched/lib/Image/Info/XBM.pm
---- Image-Info-1.16/lib/Image/Info/XBM.pm	2004-01-07 12:16:51.000000000 +0000
-+++ Image-Info-1.16-patched/lib/Image/Info/XBM.pm	2004-06-08 22:30:10.000000000 +0100
-@@ -10,7 +10,8 @@
- 	$info->push_info(0, "Warn", shift);
-     };
- 
--    my $i = Image::Xbm->new(-file, $source);
-+    my $i = Image::Xbm->new(-width => 1, -height => 1);
-+    $i->load($source);
- 
-     $info->push_info(0, "color_type" => "Grey");
-     $info->push_info(0, "file_ext" => "xbm");
diff --git a/Image-Info-1.16-XPM.pm.patch b/Image-Info-1.16-XPM.pm.patch
deleted file mode 100644
index ee019a3..0000000
--- a/Image-Info-1.16-XPM.pm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Image-Info-1.16/lib/Image/Info/XPM.pm	2004-01-07 12:20:40.000000000 +0000
-+++ Image-Info-1.16-patched/lib/Image/Info/XPM.pm	2004-07-01 01:25:55.000000000 +0100
-@@ -13,7 +13,8 @@
- 	$info->push_info(0, "Warn", shift);
-     };
- 
--    my $i = Image::Xpm->new(-file, $source);
-+    my $i = Image::Xpm->new(-width => 1, -height => 1);
-+    $i->load($source);
- 
-     $info->push_info(0, "color_type" => "Indexed-RGB");
-     $info->push_info(0, "file_ext" => "xpm");
diff --git a/Image-Info-1.16-string.t.patch b/Image-Info-1.16-string.t.patch
deleted file mode 100644
index a5b1c32..0000000
--- a/Image-Info-1.16-string.t.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN Image-Info-1.16/t/string.t Image-Info-1.16-patched/t/string.t
---- Image-Info-1.16/t/string.t	2003-10-06 18:13:30.000000000 +0100
-+++ Image-Info-1.16-patched/t/string.t	2004-06-08 22:17:41.000000000 +0100
-@@ -30,6 +30,10 @@
-     my $img = cat($file);
-     my $h2 = image_info(\$img);
- 
-+    if (my $err = $h2->{error}) {
-+      print "# - $err\n";
-+    }
-+
-     print "not " unless hash_equal($h1, $h2);
-     print "ok $testno\n";
-     $testno++;
diff --git a/Image-Info-1.19-inc-Module-Install.pm.patch b/Image-Info-1.19-inc-Module-Install.pm.patch
new file mode 100644
index 0000000..43a31fd
--- /dev/null
+++ b/Image-Info-1.19-inc-Module-Install.pm.patch
@@ -0,0 +1,11 @@
+--- Image-Info-1.19-orig/inc/Module/Install.pm	2006-03-05 09:15:08.000000000 +0000
++++ Image-Info-1.19/inc/Module/Install.pm	2006-03-06 19:18:22.000000000 +0000
+@@ -35,6 +35,8 @@
+ use File::Path ();
+ use FindBin;
+ 
++@inc::Module::Install::ISA     = 'Module::Install';
++
+ sub autoload {
+     my $self = shift;
+     my $who  = $self->_caller;
diff --git a/perl-Image-Info.spec b/perl-Image-Info.spec
index 7edf927..3df815b 100644
--- a/perl-Image-Info.spec
+++ b/perl-Image-Info.spec
@@ -1,21 +1,20 @@
 %define rgbtxt  %{_datadir}/X11/rgb.txt
 
 Name:           perl-Image-Info
-Version:        1.17
-Release:        2%{?dist}
+Version:        1.19
+Release:        1%{?dist}
 Summary:        Image meta information extraction module for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Image-Info/
 Source0:        http://www.cpan.org/authors/id/T/TE/TELS/image/Image-Info-%{version}.tar.gz
-Patch0:         Image-Info-1.16-string.t.patch
-Patch1:         Image-Info-1.16-XBM.pm.patch
-Patch2:         Image-Info-1.16-XPM.pm.patch
+Patch0:         Image-Info-1.19-inc-Module-Install.pm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl
+BuildRequires:  perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple)
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 Requires:       %{rgbtxt}
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -28,8 +27,6 @@ various types of image files.
 %prep
 %setup -q -n Image-Info-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 chmod 644 Changes README exifdump imgdump
 %{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \
     lib/Image/Info/XPM.pm
@@ -64,6 +61,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar  8 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.19-1
+- Update to 1.19.
+- Module::Install 0.58 is broken (Image-Info-1.19-inc-Module-Install.pm.patch).
+- BR: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple).
+
+* Fri Mar  3 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.18-1
+- Update to 1.18 (broken: cpan ticket #6558).
+- Dropped patches Image-Info-1.16-X[BP]M.pm.patch (accepted upstream).
+- Dropped patch Image-Info-1.16-string.t.patch (test has been rewritten).
+
 * Mon Feb 20 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.17-2
 - BR: perl(Test::Pod), perl(Test::Pod::Coverage).
 
diff --git a/sources b/sources
index 38ca032..cf9559c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b8e4f952ce7dfaa6464b9e385548a89  Image-Info-1.17.tar.gz
+5a63a7071b62d2420f822b85efde3395  Image-Info-1.19.tar.gz