diff --git a/net/p5-perl-ldap/Makefile b/net/p5-perl-ldap/Makefile
index 8d11f55e0a26..cf49e0f6ce3a 100644
--- a/net/p5-perl-ldap/Makefile
+++ b/net/p5-perl-ldap/Makefile
@@ -6,24 +6,21 @@
 #
 
 PORTNAME=	perl-ldap
-PORTVERSION=	${DISTVERSION:S/.././g}
+PORTVERSION=	0.34
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${DISTVERSION:S/..//g}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A Client interface to LDAP servers
 
-DISTVERSION=	0.33
-
-BUILD_DEPENDS=	${SITE_PERL}/Convert/ASN1.pm:${PORTSDIR}/converters/p5-Convert-ASN1 \
+RUN_DEPENDS=	${SITE_PERL}/Convert/ASN1.pm:${PORTSDIR}/converters/p5-Convert-ASN1 \
 		${SITE_PERL}/URI/ldap.pm:${PORTSDIR}/net/p5-URI \
 		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
 		${SITE_PERL}/Authen/SASL.pm:${PORTSDIR}/security/p5-Authen-SASL \
-		${SITE_PERL}/XML/SAX/Base.pm:${PORTSDIR}/textproc/p5-XML-SAX
-RUN_DEPENDS=	${BUILD_DEPENDS}
+		${SITE_PERL}/XML/SAX/Writer.pm:${PORTSDIR}/textproc/p5-XML-SAX-Writer
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
@@ -48,6 +45,7 @@ MAN3=		Bundle::Net::LDAP.3 \
 		Net::LDAP::Extra.3 \
 		Net::LDAP::FAQ.3 \
 		Net::LDAP::Filter.3 \
+		Net::LDAP::FilterMatch.3 \
 		Net::LDAP::LDIF.3 \
 		Net::LDAP::Message.3 \
 		Net::LDAP::RFC.3 \
@@ -62,12 +60,8 @@ MAN3=		Bundle::Net::LDAP.3 \
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${PERL} -ni'.bak' -e 'next if 2../^__END__$$/; print' \
-		'${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}'
-
 .if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/p5-perl-ldap/distinfo b/net/p5-perl-ldap/distinfo
index dfb41eb1f2f2..a68fed2d4d38 100644
--- a/net/p5-perl-ldap/distinfo
+++ b/net/p5-perl-ldap/distinfo
@@ -1,3 +1,3 @@
-MD5 (perl-ldap-0.33.tar.gz) = 7002aedb8bcaa7169a8f0a8e22d34b72
-SHA256 (perl-ldap-0.33.tar.gz) = b41aa47e06752514c914ea8d1bb4994ba0c1db630f54a0a5add5192783347a5e
-SIZE (perl-ldap-0.33.tar.gz) = 227888
+MD5 (perl-ldap-0.34.tar.gz) = 398689b0a7b1615075a6b5035f6e3e91
+SHA256 (perl-ldap-0.34.tar.gz) = 500958bdc22bba4f79ff1f49bef956654bb6c272329ceab9fcbda36ec6082555
+SIZE (perl-ldap-0.34.tar.gz) = 254451
diff --git a/net/p5-perl-ldap/pkg-plist b/net/p5-perl-ldap/pkg-plist
index c6d8931b8325..b30370298436 100644
--- a/net/p5-perl-ldap/pkg-plist
+++ b/net/p5-perl-ldap/pkg-plist
@@ -26,6 +26,7 @@
 %%SITE_PERL%%/Net/LDAP/FAQ.pod
 %%SITE_PERL%%/Net/LDAP/Filter.pm
 %%SITE_PERL%%/Net/LDAP/Filter.pod
+%%SITE_PERL%%/Net/LDAP/FilterMatch.pm
 %%SITE_PERL%%/Net/LDAP/LDIF.pm
 %%SITE_PERL%%/Net/LDAP/LDIF.pod
 %%SITE_PERL%%/Net/LDAP/Message.pm
@@ -41,12 +42,13 @@
 %%SITE_PERL%%/Net/LDAP/Util.pm
 %%SITE_PERL%%/Net/LDAPI.pm
 %%SITE_PERL%%/Net/LDAPS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/perl-ldap/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LDAP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/LDAP/Control
 @dirrm %%SITE_PERL%%/Net/LDAP/Extension
 @dirrm %%SITE_PERL%%/Net/LDAP
 @dirrm %%SITE_PERL%%/Bundle/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/perl-ldap
 @dirrmtry %%SITE_PERL%%/Bundle
 @dirrmtry %%SITE_PERL%%/Net
 @dirrmtry %%SITE_PERL%%/LWP/Protocol