diff --git a/devel/p5-System2/Makefile b/devel/p5-System2/Makefile
index cf57ace80a9c..2e54553b7672 100644
--- a/devel/p5-System2/Makefile
+++ b/devel/p5-System2/Makefile
@@ -1,18 +1,23 @@
 PORTNAME=	System2
-PORTVERSION=	0.84
-PORTREVISION=	1
+PORTVERSION=	0.85.1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Like system(), but with STDERR available as well
 WWW=		https://metacpan.org/release/System2
 
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USES=		perl5
 USE_PERL5=	configure
 
+NO_ARCH=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME:R}
+
 pre-configure:
 	${RM} ${WRKSRC}/io_test.pl
 
 .include <bsd.port.mk>
diff --git a/devel/p5-System2/distinfo b/devel/p5-System2/distinfo
index 31919f5ef853..6b9cbc73a22e 100644
--- a/devel/p5-System2/distinfo
+++ b/devel/p5-System2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (System2-0.84.tar.gz) = 177038c853469642a2347df34c1d9eaff65ab5610a8d06d7df10c230aa65adf1
-SIZE (System2-0.84.tar.gz) = 6192
+TIMESTAMP = 1698341301
+SHA256 (System2-0.85.1.tar.gz) = fdd3eef30d7664d104ab4bfad26b54e0773c9cf4a020bfb92fd27ab2b41ae02d
+SIZE (System2-0.85.1.tar.gz) = 6506