diff --git a/.cvsignore b/.cvsignore
index c92fd3f..72b61a6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-DBI-1.607.tar.gz
+DBI-1.609.tar.gz
diff --git a/perl-DBI-1.37-prever.patch b/perl-DBI-1.37-prever.patch
deleted file mode 100644
index 3380d50..0000000
--- a/perl-DBI-1.37-prever.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This diff is to remove a version check that is causing trouble with
-RH's perl 5.8.1 prerelease.  Since we mark it as 5.8.0, this confuses
-modules that do checks.
---- DBI-1.37/DBI.xs.prever	2003-07-07 08:42:08.000000000 -0400
-+++ DBI-1.37/DBI.xs	2003-07-07 08:42:31.000000000 -0400
-@@ -54,10 +54,6 @@
- #define aTHXo_
- #endif
- 
--#if (PERL_VERSION < 8) || ((PERL_VERSION == 8) && (PERL_SUBVERSION == 0))
--#define DBI_save_hv_fetch_ent
--#endif
--
- 
- static imp_xxh_t *dbih_getcom	   _((SV *h));
- static imp_xxh_t *dbih_getcom2	   _((SV *h, MAGIC **mgp));
diff --git a/perl-DBI-1.601-script-interpreter.patch b/perl-DBI-1.601-script-interpreter.patch
deleted file mode 100644
index 8014dc8..0000000
--- a/perl-DBI-1.601-script-interpreter.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- DBI-1.601/dbixs_rev.pl	Mon Jul 16 07:04:58 2007
-+++ DBI-1.601/dbixs_rev.pl	Tue Nov 13 21:06:15 2007
-@@ -1,4 +1,4 @@
--#!perl -w
-+#!/usr/bin/perl -w
- use strict;
- 
- my $dbixs_rev_file = "dbixs_rev.h";
diff --git a/perl-DBI.spec b/perl-DBI.spec
index 1ab2676..33aa98d 100644
--- a/perl-DBI.spec
+++ b/perl-DBI.spec
@@ -1,13 +1,12 @@
 Name:           perl-DBI
-Version:        1.607
-Release:        2%{?dist}
+Version:        1.609
+Release:        1%{?dist}
 Summary:        A database access API for perl
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://dbi.perl.org/
 Source0:        http://www.cpan.org/authors/id/T/TI/TIMB/DBI-%{version}.tar.gz
-Patch0:         perl-DBI-1.601-script-interpreter.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::Pod)
@@ -23,9 +22,12 @@ database interface independent of the actual database being used.
 
 %prep
 %setup -q -n DBI-%{version} 
-%patch0 -p1
+
+iconv -f iso8859-1 -t utf-8 lib/DBD/Gofer.pm >lib/DBD/Gofer.pm.new &&
+  mv lib/DBD/Gofer.pm{.new,}
 
 chmod 644 ex/*
+chmod 744 dbixs_rev.pl
 
 # Filter unwanted Requires:
 cat << EOF > %{name}-req
@@ -37,10 +39,8 @@ EOF
 %define __perl_requires %{_builddir}/DBI-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
-chmod 744 dbixs_rev.pl
-
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
 
 
@@ -53,15 +53,11 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 # Remove Win32 specific files and man pages to avoid unwanted dependencies
-rm -rf $RPM_BUILD_ROOT%{perl_vendorarch}/{Win32,DBI/W32ODBC.pm}
-rm -f $RPM_BUILD_ROOT%{_mandir}/man3/{DBI::W32ODBC.3pm,Win32::DBIODBC.3pm}
+rm -rf $RPM_BUILD_ROOT%{perl_vendorarch}/{Win32,DBI/W32ODBC.pm} \
+	 $RPM_BUILD_ROOT%{_mandir}/man3/{DBI::W32,Win32::DBI}ODBC.3pm
 
-# This particular man page is not UTF8 for some reason
-pushd $RPM_BUILD_ROOT%{_mandir}/man3/
-/usr/bin/iconv -f iso8859-1 -t utf-8 DBD::Gofer.3pm > DBD::Gofer.3pm.conv && /bin/mv -f DBD::Gofer.3pm.conv DBD::Gofer.3pm
-popd
-
-perl -pi -e 's"#!perl -w"#!/usr/bin/perl"' $RPM_BUILD_ROOT%{perl_vendorarch}/goferperf.pl
+perl -pi -e 's"#!perl -w"#!/usr/bin/perl -w"' \
+	$RPM_BUILD_ROOT%{perl_vendorarch}/{goferperf,dbixs_rev}.pl
 
 
 %check
@@ -86,6 +82,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jun 10 2009 Stepan Kasal <skasal@redhat.com> - 1.609-1
+- new upstream version
+- drop unneeded build patch
+- move the iconv to convert the source
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.607-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 5770920..da29b37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd5785b39675213948a61dea1b400012  DBI-1.607.tar.gz
+e4689870b3f7ce503022a076c53284ed  DBI-1.609.tar.gz