diff --git a/converters/p5-Encode/Makefile b/converters/p5-Encode/Makefile
index c2748c3792ca..439a2c63a045 100644
--- a/converters/p5-Encode/Makefile
+++ b/converters/p5-Encode/Makefile
@@ -1,35 +1,54 @@
 # New ports collection makefile for:	p5-Encode
 # Date created:				Jul 24, 2005
 # Whom:					Rong-En Fan <rafan@infor.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Encode
-PORTVERSION=	2.21
+PORTVERSION=	2.23
 CATEGORIES=	converters perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Encode
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	Provides interfaces between strings and the rest of the system
 
 PERL_CONFIGURE=	yes
 
+MAN3=		Encode.3 \
+		Encode::Alias.3 \
+		Encode::CJKConstants.3 \
+		Encode::CN::HZ.3 \
+		Encode::Config.3 \
+		Encode::Encoder.3 \
+		Encode::Encoding.3 \
+		Encode::GSM0338.3 \
+		Encode::Guess.3 \
+		Encode::JP::H2Z.3 \
+		Encode::JP::JIS7.3 \
+		Encode::KR::2022_KR.3 \
+		Encode::MIME::Header.3 \
+		Encode::MIME::Name.3 \
+		Encode::PerlIO.3 \
+		Encode::Supported.3 \
+		Encode::Unicode::UTF7.3 \
+		encoding.3
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500703
 IGNORE=		requires Perl 5.7.3 or above
 .endif
 
 .if ${PERL_LEVEL} > 500800
 post-patch:
-	${PERL} -pi -e '$$_="" if $$.>=18 && $$.<=20' ${WRKSRC}/Makefile.PL
+	${PERL} -pi -e '$$_="" if $$.>=23 && $$.<=25; $$_="my \@exe_files=();\n" if $$.==25' ${WRKSRC}/Makefile.PL
 .endif
 
 post-configure:
 	@${FIND} ${WRKSRC}/ -name Makefile -exec \
 		${REINPLACE_CMD} -e 's,^CC =,CC ?=,' {} \;
 
 .include <bsd.port.post.mk>
diff --git a/converters/p5-Encode/distinfo b/converters/p5-Encode/distinfo
index 1e358b68840a..50c04e0c331a 100644
--- a/converters/p5-Encode/distinfo
+++ b/converters/p5-Encode/distinfo
@@ -1,3 +1,3 @@
-MD5 (Encode-2.21.tar.gz) = b12b00c87d116f3692d4570a29b5fe41
-SHA256 (Encode-2.21.tar.gz) = e2c2fb3ffe6f5d3c09f6bc4d0a6b3a6e62d300721483f2133b4e1bed37847780
-SIZE (Encode-2.21.tar.gz) = 1997685
+MD5 (Encode-2.23.tar.gz) = 0b96a73d0bf7586946b651a0e30cfe17
+SHA256 (Encode-2.23.tar.gz) = 669e978fa67f38ef614f4bb30eb70540eb54da51d1c32991b9891342a662fd96
+SIZE (Encode-2.23.tar.gz) = 1998319