diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile
index a0b43295c9fe..a2534d93d513 100644
--- a/mail/p5-Mail-DKIM/Makefile
+++ b/mail/p5-Mail-DKIM/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2024/01/29 15:27:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.57 2024/02/04 05:48:29 schmonz Exp $
 
 DISTNAME=		Mail-DKIM-1.20240124
 PKGNAME=		p5-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		mail perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Mail/}
 
@@ -12,6 +13,7 @@ LICENSE=		${PERL5_LICENSE}
 
 DEPENDS+=		p5-Crypt-OpenSSL-RSA>=0.27:../../security/p5-Crypt-OpenSSL-RSA
 DEPENDS+=		p5-CryptX>=0.0:../../security/p5-CryptX
+DEPENDS+=		p5-Getopt-Long-Descriptive-[0-9]*:../../devel/p5-Getopt-Long-Descriptive
 DEPENDS+=		p5-MailTools-[0-9]*:../../mail/p5-MailTools
 DEPENDS+=		p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
 DEPENDS+=		p5-YAML-LibYAML-[0-9]*:../../textproc/p5-YAML-LibYAML
@@ -23,11 +25,12 @@ TOOL_DEPENDS+=		p5-Test-RequiresInternet-[0-9]*:../../net/p5-Test-RequiresIntern
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Mail/DKIM/.packlist
 
-REPLACE_PERL+=		lib/Mail/DKIM.pm
-REPLACE_PERL+=		lib/Mail/DKIM/*.pm
-REPLACE_PERL+=		lib/Mail/DKIM/Algorithm/*.pm
-REPLACE_PERL+=		lib/Mail/DKIM/Canonicalization/*.pm
-REPLACE_PERL+=		scripts/sample_mime_lite.pl
+REPLACE_PERL=		scripts/*sign.pl scripts/*verify.pl
+
+SUBST_CLASSES+=		lib
+SUBST_STAGE.lib=	pre-configure
+SUBST_FILES.lib=	${REPLACE_PERL}
+SUBST_SED.lib=		-e '1s| -I../lib$$||'
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-DKIM/distinfo b/mail/p5-Mail-DKIM/distinfo
index 4b5b4e4ce79b..14b5fa12cdd2 100644
--- a/mail/p5-Mail-DKIM/distinfo
+++ b/mail/p5-Mail-DKIM/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.32 2024/01/29 15:27:08 schmonz Exp $
+$NetBSD: distinfo,v 1.33 2024/02/04 05:48:29 schmonz Exp $
 
 BLAKE2s (Mail-DKIM-1.20240124.tar.gz) = 2b6f51398cf9feb621188dcbe131b7e3258d939124ba33e1c8758f9461c7a9bd
 SHA512 (Mail-DKIM-1.20240124.tar.gz) = 5453bca0e27906193084f0faf94b06c3a01cc835d4d226a0281793ea5e7105b4907090f25769dc5f51b6b816eacb5abceb56a046716a80a0288f3332c655c1c8
 Size (Mail-DKIM-1.20240124.tar.gz) = 183426 bytes
+SHA1 (patch-Makefile.PL) = 376aaff4b9c6c78156eb1debd289ce912b5fa347
diff --git a/mail/p5-Mail-DKIM/patches/patch-Makefile.PL b/mail/p5-Mail-DKIM/patches/patch-Makefile.PL
new file mode 100644
index 000000000000..e5c1648073f2
--- /dev/null
+++ b/mail/p5-Mail-DKIM/patches/patch-Makefile.PL
@@ -0,0 +1,14 @@
+$NetBSD: patch-Makefile.PL,v 1.1 2024/02/04 05:48:29 schmonz Exp $
+
+Install the scripts.
+
+--- Makefile.PL.orig	2024-01-24 04:01:35.000000000 +0000
++++ Makefile.PL
+@@ -41,6 +41,7 @@ my %WriteMakefileArgs = (
+     "lib" => 0
+   },
+   "VERSION" => "1.20240124",
++  "EXE_FILES" => [qw(scripts/arcsign.pl scripts/arcverify.pl scripts/dkimsign.pl scripts/dkimverify.pl)],
+   "test" => {
+     "TESTS" => "t/*.t"
+   }