diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index ce7e1c9a778f..75bf20370829 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -1,29 +1,25 @@
 PORTNAME=	DBD-Pg
-PORTVERSION=	3.20.2
-PORTREVISION=	1
+PORTVERSION=	3.21.2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TURNSTEP
 PKGNAMEPREFIX=	p5-
 
-PATCH_SITES=	https://github.com/bucardo/dbdpg/commit/
-PATCHFILES=	c78eb5aabb203c7dadc838f9d60c9202527260fd.patch:-p1
-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Provides access to PostgreSQL databases through the DBI
 WWW=		https://metacpan.org/release/DBD-Pg
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/LICENSES/artistic.txt
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>=1.614:databases/p5-DBI
 
 USES=		perl5 pgsql
 USE_PERL5=	configure
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/Pg/Pg.so
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-Pg/distinfo b/databases/p5-DBD-Pg/distinfo
index 4c2898c01b56..83328702d3a0 100644
--- a/databases/p5-DBD-Pg/distinfo
+++ b/databases/p5-DBD-Pg/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1784005406
-SHA256 (DBD-Pg-3.20.2.tar.gz) = 526d3372e6d69766cb683618d1f3b48aca57bfadb1de1db16c3b8136fe61176c
-SIZE (DBD-Pg-3.20.2.tar.gz) = 306601
-SHA256 (c78eb5aabb203c7dadc838f9d60c9202527260fd.patch) = 5929aebf81912f2201a0bcdb8bee519e175e7406a9a81737cbed6a5352dd6430
-SIZE (c78eb5aabb203c7dadc838f9d60c9202527260fd.patch) = 2776
+TIMESTAMP = 1788499988
+SHA256 (DBD-Pg-3.21.2.tar.gz) = d79179255ccb0c87b029db2eecaea56828e581255c48445d5fc0e79fa4e9245b
+SIZE (DBD-Pg-3.21.2.tar.gz) = 318356
diff --git a/databases/p5-DBD-Pg/files/patch-Makefile.PL b/databases/p5-DBD-Pg/files/patch-Makefile.PL
index 3c330ee1c9fb..74a5d417c1eb 100644
--- a/databases/p5-DBD-Pg/files/patch-Makefile.PL
+++ b/databases/p5-DBD-Pg/files/patch-Makefile.PL
@@ -1,19 +1,19 @@
---- Makefile.PL.orig	2020-04-18 17:55:08 UTC
+--- Makefile.PL.orig	2026-08-26 19:57:11 UTC
 +++ Makefile.PL
-@@ -212,7 +212,7 @@ my %opts =
+@@ -232,7 +232,7 @@ my %opts =
      (
       NAME           => 'DBD::Pg',
       VERSION_FROM   => 'Pg.pm',
--     INC            => "-I$POSTGRES_INCLUDE -I$dbi_arch_dir",
-+     INC            => "-I$POSTGRES_INCLUDE -I$dbi_arch_dir $comp_opts",
-      OBJECT         => 'Pg$(OBJ_EXT) dbdimp$(OBJ_EXT) quote$(OBJ_EXT) types$(OBJ_EXT)',
-      LIBS           => ["-L$POSTGRES_LIB -lpq -lm"],
+-     INC            => qq{-I"$POSTGRES_INCLUDE" -I"$dbi_arch_dir"},
++     INC            => qq{-I"$POSTGRES_INCLUDE" -I"$dbi_arch_dir" $comp_opts},
+      OBJECT         => 'Pg$(OBJ_EXT) dbdimp$(OBJ_EXT) quote$(OBJ_EXT) types$(OBJ_EXT) strbuf$(OBJ_EXT)',
+      LIBS           => ["-L\"$POSTGRES_LIB\" -lpq -lm"],
       AUTHOR         => 'Greg Sabino Mullane',
-@@ -224,7 +224,6 @@ my %opts =
+@@ -245,7 +245,6 @@ my %opts =
                          'Time::HiRes'         => '0',
                          'version'             => '0',
                         },
 -     CCFLAGS        => $comp_opts,
       PERL_MALLOC_OK => 1,
       NEEDS_LINKING  => 1,
       NO_META        => 1,