diff --git a/net/p5-Net-Radius/Makefile b/net/p5-Net-Radius/Makefile
index b90f49fb2bb..548581aebc1 100644
--- a/net/p5-Net-Radius/Makefile
+++ b/net/p5-Net-Radius/Makefile
@@ -1,24 +1,25 @@
-# $OpenBSD: Makefile,v 1.14 2020/07/03 21:45:35 sthen Exp $
+COMMENT =	Perl interface to Radius
 
-COMMENT=	Perl interface to Radius
+DISTNAME =	Net-Radius-2.103
+REVISION =	2
 
-DISTNAME=	Net-Radius-2.103
-REVISION=	1
+CATEGORIES =	net devel
 
-CATEGORIES=	net devel
+MAINTAINER =	Alexander Bluhm <bluhm@openbsd.org>
 
-MAINTAINER=	Alexander Bluhm <bluhm@openbsd.org>
+# Perl
+PERMIT_PACKAGE =	Yes
 
-# perl artistic license
-PERMIT_PACKAGE=	Yes
+MODULES =		cpan
+MODCPAN_EXAMPLES =	Yes
 
-MODULES=		cpan
-PKG_ARCH=		*
-MODCPAN_EXAMPLES=	Yes
-TEST_DEPENDS=	devel/p5-Test-Warn
+TEST_DEPENDS =		devel/p5-Test-Pod \
+			devel/p5-Test-Warn
 
-DATADIR=	${PREFIX}/share/p5-Net-Radius
-DICTS=		dictionary \
+PKG_ARCH =		*
+
+DATADIR =	${PREFIX}/share/p5-Net-Radius
+DICTS =		dictionary \
 		dictionary.3com \
 		dictionary.3com-o \
 		dictionary.3gpp \
@@ -83,8 +84,8 @@ DICTS=		dictionary \
 		dictionary.versanet \
 		dictionary.wispr \
 		dictionary.xedia
-DOCDIR=		${PREFIX}/share/doc/p5-Net-Radius
-DOCS=		README \
+DOCDIR =	${PREFIX}/share/doc/p5-Net-Radius
+DOCS =		README \
 		README.3COM \
 		README.VSA \
 		README.broken \
diff --git a/net/p5-Net-Radius/patches/patch-Radius_Dictionary_pm b/net/p5-Net-Radius/patches/patch-Radius_Dictionary_pm
new file mode 100644
index 00000000000..e0ad1bbb3ac
--- /dev/null
+++ b/net/p5-Net-Radius/patches/patch-Radius_Dictionary_pm
@@ -0,0 +1,12 @@
+Index: Radius/Dictionary.pm
+--- Radius/Dictionary.pm.orig
++++ Radius/Dictionary.pm
+@@ -376,6 +376,8 @@ may otherwise cause insanity and/or blindness if studi
+ 
+ =head1 AUTHOR
+ 
++=encoding utf8
++
+ Christopher Masto <chris@netmonger.net>, 
+ Luis E. Muñoz <luismunoz@cpan.org> contributed the VSA code.
+ 
diff --git a/net/p5-Net-Radius/patches/patch-Radius_Packet_pm b/net/p5-Net-Radius/patches/patch-Radius_Packet_pm
new file mode 100644
index 00000000000..fb3aa12757f
--- /dev/null
+++ b/net/p5-Net-Radius/patches/patch-Radius_Packet_pm
@@ -0,0 +1,12 @@
+Index: Radius/Packet.pm
+--- Radius/Packet.pm.orig
++++ Radius/Packet.pm
+@@ -998,6 +998,8 @@ implementation of a RADIUS server.
+ 
+ =head1 AUTHOR
+ 
++=encoding utf8
++
+ Christopher Masto, <chris@netmonger.net>. VSA support by Luis
+ E. Muñoz, <luismunoz@cpan.org>. Fix for unpacking 3COM VSAs
+ contributed by Ian Smith <iansmith@ncinter.net>. Information for
diff --git a/net/p5-Net-Radius/pkg/PLIST b/net/p5-Net-Radius/pkg/PLIST
index 69da573b463..bc957756932 100644
--- a/net/p5-Net-Radius/pkg/PLIST
+++ b/net/p5-Net-Radius/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2010/05/20 20:12:13 bluhm Exp $
 ${P5SITE}/Net/
 ${P5SITE}/Net/Radius/
 ${P5SITE}/Net/Radius/Dictionary.pm