diff --git a/.cvsignore b/.cvsignore
index b3a9edb..4543470 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-TermReadKey-2.20.tar.gz
+TermReadKey-2.30.tar.gz
diff --git a/perl-TermReadKey.spec b/perl-TermReadKey.spec
index 08e148d..9fc06c6 100644
--- a/perl-TermReadKey.spec
+++ b/perl-TermReadKey.spec
@@ -1,54 +1,61 @@
-%define _use_internal_dependency_generator 0
-
-Name: perl-TermReadKey
-Version: 2.20
-Release: 18
-Summary: A perl module for simple terminal control.
-License: distributable
-Group: Development/Libraries
-URL: http://search.cpan.org/search?mode=module&query=TermReadKey
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: perl >= 0:5.00503
-Source0: TermReadKey-%{version}.tar.gz
+Name:           perl-TermReadKey
+Version:        2.30
+Release:        1
+Summary:        A perl module for simple terminal control
+
+Group:          Development/Libraries
+License:        Distributable
+URL:            http://search.cpan.org/dist/TermReadKey/
+Source0:        http://www.cpan.org/authors/id/J/JS/JSTOWE/TermReadKey-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  perl >= 1:5.6.1
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Term::ReadKey is a compiled perl module dedicated to providing simple
-control over terminal driver modes (cbreak, raw, cooked, etc.,)
-support for non-blocking reads and some generalized handy functions
-for working with terminals.
+control over terminal driver modes (cbreak, raw, cooked, etc.)
+support for non-blocking reads, if the architecture allows, and some
+generalized handy functions for working with terminals.  One of the
+main goals is to have the functions as portable as possible, so you
+can just plug in "use Term::ReadKey" on any architecture and have a
+good likelyhood of it working.
+
 
 %prep
 %setup -q -n TermReadKey-%{version} 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor
-make
-# make test || /bin/true
+CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 %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 {} ';'
+find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+chmod -R u+w $RPM_BUILD_ROOT/*
 
+%check || :
+make test
+
+%clean
 rm -rf $RPM_BUILD_ROOT
-make install
 
-find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
 
-find $RPM_BUILD_ROOT/usr -type f -print | \
-	sed "s@^$RPM_BUILD_ROOT@@g" | \
-	grep -v perllocal.pod | \
-	grep -v "\.packlist" > TermReadKey-%{version}-filelist
-if [ "$(cat TermReadKey-%{version}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit -1
-fi
+%files
+%defattr(-,root,root,-)
+%doc README
+%{perl_vendorarch}/Term/
+%{perl_vendorarch}/auto/Term/
+%{_mandir}/man3/*.3*
 
-%files -f TermReadKey-%{version}-filelist
-%defattr(-,root,root)
 
 %changelog
-* Wed Mar 30 2005 Warren Togami <wtogami@redhat.com>
-- remove brp-compress
+* Sat Apr 02 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.30-1
+- Update to 2.30.
+- spec cleanup (#153200)
 
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
diff --git a/sources b/sources
index ae18bd0..8c36c35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-25f56ae64b3f1ef86c24fcd349acb48d  TermReadKey-2.20.tar.gz
+f0ef2cea8acfbcc58d865c05b0c7e1ff  TermReadKey-2.30.tar.gz