diff --git a/audio/p5-CDDB_get/Makefile b/audio/p5-CDDB_get/Makefile
index 53e62775a1cf..14c7adef34d1 100644
--- a/audio/p5-CDDB_get/Makefile
+++ b/audio/p5-CDDB_get/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	CDDB_get
-PORTVERSION=	2.11
+PORTVERSION=	2.2
+PORTEPOCH=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=../by-authors/id/F/FO/FONKIE
@@ -18,6 +19,5 @@ COMMENT=	A high-level interface to the Compact Disc Database
 PERL_CONFIGURE=	yes
 
 MAN3=		CDDB_get.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/audio/p5-CDDB_get/distinfo b/audio/p5-CDDB_get/distinfo
index 507efc817508..0f8770f0c5fd 100644
--- a/audio/p5-CDDB_get/distinfo
+++ b/audio/p5-CDDB_get/distinfo
@@ -1 +1 @@
-MD5 (CDDB_get-2.11.tar.gz) = a1d236877be28a4200411de3afa41814
+MD5 (CDDB_get-2.2.tar.gz) = 43e61db40bc816201a6cd3879ed0d2ca
diff --git a/audio/p5-CDDB_get/pkg-plist b/audio/p5-CDDB_get/pkg-plist
index 3eb9ac75fa18..1e4ef3f85240 100644
--- a/audio/p5-CDDB_get/pkg-plist
+++ b/audio/p5-CDDB_get/pkg-plist
@@ -1,7 +1,7 @@
 bin/cddb.pl
-lib/perl5/site_perl/%%PERL_VER%%/CDDB_get.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/CDDB_get/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/cddb.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CDDB_get/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/CDDB_get
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CDDB_get
+%%SITE_PERL%%/CDDB_get.pm
+%%SITE_PERL%%/auto/CDDB_get/autosplit.ix
+%%SITE_PERL%%/cddb.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB_get/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB_get
+@dirrm %%SITE_PERL%%/auto/CDDB_get