diff --git a/perl-LDAP.spec b/perl-LDAP.spec
index cd9dde7..057fec9 100644
--- a/perl-LDAP.spec
+++ b/perl-LDAP.spec
@@ -1,19 +1,19 @@
 Name:           perl-LDAP
 Version:        0.33
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:          1
 Summary:        LDAP Perl module
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/perl-ldap/
-Source0:        http://www.cpan.org/authors/id/G/GB/GBARR/perl-ldap-0.33.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GB/GBARR/perl-ldap-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 2:5.8.0
 BuildRequires:  perl(Convert::ASN1)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(IO::Socket::SSL)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	perl(IO::Socket::SSL)
 #Wish list
 #Requires:       perl(Authen::SASL)
@@ -26,7 +26,7 @@ maintenance functions such as adding, deleting or modifying entries.
 
 %prep
 %setup -q -n perl-ldap-%{version}
-chmod 644 bin/* contrib/*
+chmod -c 644 bin/* contrib/* lib/Net/LDAP/DSML.pm
 %{__perl} -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' contrib/*
 
 %build
@@ -40,7 +40,7 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
-%check || :
+%check
 mv t/0-signature.t t/0-signature.t.skip
 make test
  
@@ -55,10 +55,16 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/Bundle/
 %{perl_vendorlib}/LWP/
 %{perl_vendorlib}/Net/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Wed Sep 27 2006 Robin Norwood <rnorwood@redhat.com> - 1:0.33-3
+- Bugzilla: 207430
+- Incorporate fixes from Jose Oliveira's patch
+- Add perl(IO::Socket::SSL) as a BuildRequires as well
+- Other cleanups from Jose
+
 * Wed Sep 27 2006 Robin Norwood <rnorwood@redhat.com> - 0.33-1.3
 - Add a requirement for IO::Socket::SSL, per bug #122066