diff --git a/.cvsignore b/.cvsignore
index f18bb61..8deac1c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Net_SSLeay.pm-1.26.tar.gz
+Net_SSLeay.pm-1.30.tar.gz
diff --git a/perl-Net-SSLeay.spec b/perl-Net-SSLeay.spec
index 415b3e1..a45633e 100644
--- a/perl-Net-SSLeay.spec
+++ b/perl-Net-SSLeay.spec
@@ -1,23 +1,24 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
+#
+# Rebuild switch:
+#  --with testsuite          enable test suite
+#
 
 Name:           perl-Net-SSLeay
-Version:        1.26
-Release:        2%{?dist}
-Epoch:          0
+Version:        1.30
+Release:        4%{?dist}
 Summary:        Perl extension for using OpenSSL
 
 Group:          Development/Libraries
-License:        BSDish
+License:        OpenSSL
 URL:            http://search.cpan.org/dist/Net_SSLeay.pm/
-Source0:        http://www.fas.harvard.edu/~behrooz/Net_SSLeay.pm-1.26.tar.gz
+Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Net_SSLeay.pm-%{version}.tar.gz
 Patch0:         %{name}-test14.patch
 Patch1:         perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl
 BuildRequires:  openssl-devel
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Provides:       perl-Net_SSLeay = %{epoch}:%{version}-%{release}
 
 %description
 This module offers some high level convinience functions for accessing
@@ -39,22 +40,23 @@ mv SSLeay.pm.utf8 SSLeay.pm
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL -- INSTALLDIRS=vendor
-%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL -- INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -a \( -name .packlist -o -name ptrtstrun.pl \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+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 {} ';'
+rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/Net/ptrtstrun.pl
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
-# make test # spawns servers, contacts external sites...
+%check
+# spawns servers, contacts external sites...
+%{?_with_testsuite:make test}
 
 
 %clean
@@ -70,8 +72,26 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu May 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.26-2
-- CVE-2005-0106 (#191351).
+* Fri Jul 14 2006 Warren Togami <wtogami@redhat.com> - 1.30-4
+- import into FC6
+
+* Tue Feb 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.30-3
+- Rebuild for FC5 (perl 5.8.8).
+
+* Fri Jan 27 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.30-2
+- CVE-2005-0106: patch from Mandriva
+  http://wwwnew.mandriva.com/security/advisories?name=MDKSA-2006:023
+
+* Sun Jan 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.30-1
+- 1.30.
+- Optionally run the test suite during build with "--with tests".
+
+* Wed Nov  9 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.26-3
+- Rebuild for new OpenSSL.
+- Cosmetic cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.26-2
+- rebuilt
 
 * Mon Dec 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.26-1
 - Drop fedora.us release prefix and suffix.
diff --git a/sources b/sources
index f17b403..32b9f7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b7b044f553d089a1bce9fa0ef4c6615  Net_SSLeay.pm-1.26.tar.gz
+b0cd6c1681bbc0695d81be5cd852d1d0  Net_SSLeay.pm-1.30.tar.gz