diff --git a/databases/pgbackrest/Makefile b/databases/pgbackrest/Makefile
index 01090b92483e..3e0ae5cf6b00 100644
--- a/databases/pgbackrest/Makefile
+++ b/databases/pgbackrest/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	pgbackrest
 DISTVERSIONPREFIX=	release/
-DISTVERSION=	2.57.0
+DISTVERSION=	2.58.0
 CATEGORIES=	databases
 
 MAINTAINER=	schoutm@gmail.com
 COMMENT=	Reliable PostgreSQL Backup & Restore
 WWW=		https://pgbackrest.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 		libyaml.so:textproc/libyaml
 
 USES=		gnome meson pgsql pkgconfig python ssl
 USE_GITHUB=	yes
 USE_GNOME=	libxml2
 
-MESON_ARGS+=	-Dconfigdir="${LOCALBASE}/etc/pgbackrest"
+MESON_ARGS+=	-Dconfigdir="${ETCDIR}"
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		SFTP ZSTD
 
 SFTP_DESC=		Enable SFTP storage support
 
 SFTP_LIB_DEPENDS=	libssh2.so:security/libssh2
 SFTP_MESON_ON=		-Dlibssh2=enabled
 SFTP_MESON_OFF=		-Dlibssh2=disabled
 
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_MESON_ON=		-Dlibzstd=enabled
 ZSTD_MESON_OFF=		-Dlibzstd=disabled
 
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/pgbackrest
+	${MKDIR} ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/pgbackrest/distinfo b/databases/pgbackrest/distinfo
index 1380f541b214..a6809195b1e5 100644
--- a/databases/pgbackrest/distinfo
+++ b/databases/pgbackrest/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1761754223
-SHA256 (pgbackrest-pgbackrest-release-2.57.0_GH0.tar.gz) = d794519c0ecb4ec17f41c4267d07fe80ab6b3ac9cc1de5c7984887c5e6d7448a
-SIZE (pgbackrest-pgbackrest-release-2.57.0_GH0.tar.gz) = 2701663
+TIMESTAMP = 1770399711
+SHA256 (pgbackrest-pgbackrest-release-2.58.0_GH0.tar.gz) = 2517ec0a7f66be0f1bc77795c3a19cd41c4b106699321d3ac511bc539dd2bfca
+SIZE (pgbackrest-pgbackrest-release-2.58.0_GH0.tar.gz) = 2592402