diff --git a/databases/postgresql13-contrib/Makefile b/databases/postgresql13-contrib/Makefile
index 7bac5c915b90..ad8a568951ee 100644
--- a/databases/postgresql13-contrib/Makefile
+++ b/databases/postgresql13-contrib/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org
diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile
index df8969e7cece..07b2113be886 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -1,7 +1,7 @@
-DISTVERSION?=	13.21
+DISTVERSION?=	13.22
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	1
+PORTREVISION?=	0
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
@@ -21,4 +21,4 @@ PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
-.include "${.CURDIR}/../postgresql16-server/Makefile"
+.include "${.CURDIR}/../postgresql18-server/Makefile"
diff --git a/databases/postgresql13-server/distinfo b/databases/postgresql13-server/distinfo
index d2ad227cd1bb..2920b5bae795 100644
--- a/databases/postgresql13-server/distinfo
+++ b/databases/postgresql13-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746521296
-SHA256 (postgresql/postgresql-13.21.tar.bz2) = dcda1294df45f033b0656cf7a8e4afbbc624c25e1b144aec79530f74d7ef4ab4
-SIZE (postgresql/postgresql-13.21.tar.bz2) = 21759813
+TIMESTAMP = 1755094737
+SHA256 (postgresql/postgresql-13.22.tar.bz2) = d36d83dc89e625502cf6fb1d0529642ba1266bd614b4e4a41cefd1dddcf09080
+SIZE (postgresql/postgresql-13.22.tar.bz2) = 21783034
diff --git a/databases/postgresql13-server/files/postgresql.in b/databases/postgresql13-server/files/postgresql.in
index 073d3a64c004..3227deee0b5d 100644
--- a/databases/postgresql13-server/files/postgresql.in
+++ b/databases/postgresql13-server/files/postgresql.in
@@ -41,7 +41,7 @@ eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%"
 
 name=postgresql
 rcvar=postgresql_enable
-extra_commands="reload initdb"
+extra_commands="reload initdb promote logrotate"
 
 start_cmd="postgresql_command start"
 stop_cmd="postgresql_command stop"
@@ -49,6 +49,7 @@ restart_cmd="postgresql_command restart"
 reload_cmd="postgresql_command reload"
 status_cmd="postgresql_command status"
 promote_cmd="postgresql_command promote"
+logrotate_cmd="postgresql_command logrotate"
 
 initdb_cmd="postgresql_initdb"
 
diff --git a/databases/postgresql14-contrib/Makefile b/databases/postgresql14-contrib/Makefile
index f0c2e269585d..e60bf88b53b4 100644
--- a/databases/postgresql14-contrib/Makefile
+++ b/databases/postgresql14-contrib/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org
diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile
index d72b1bd1c81b..0b7b0fbea429 100644
--- a/databases/postgresql14-server/Makefile
+++ b/databases/postgresql14-server/Makefile
@@ -1,7 +1,7 @@
-DISTVERSION?=	14.18
+DISTVERSION?=	14.19
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	1
+PORTREVISION?=	0
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
@@ -21,4 +21,4 @@ PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
-.include "${.CURDIR}/../postgresql16-server/Makefile"
+.include "${.CURDIR}/../postgresql18-server/Makefile"
diff --git a/databases/postgresql14-server/distinfo b/databases/postgresql14-server/distinfo
index 886ee28e6b73..539f677b0dc7 100644
--- a/databases/postgresql14-server/distinfo
+++ b/databases/postgresql14-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746521297
-SHA256 (postgresql/postgresql-14.18.tar.bz2) = 83ab29d6bfc3dc58b2ed3c664114fdfbeb6a0450c4b8d7fa69aee91e3ca14f8e
-SIZE (postgresql/postgresql-14.18.tar.bz2) = 22503241
+TIMESTAMP = 1755094738
+SHA256 (postgresql/postgresql-14.19.tar.bz2) = 727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80
+SIZE (postgresql/postgresql-14.19.tar.bz2) = 22517457
diff --git a/databases/postgresql14-server/files/postgresql.in b/databases/postgresql14-server/files/postgresql.in
index 073d3a64c004..3227deee0b5d 100644
--- a/databases/postgresql14-server/files/postgresql.in
+++ b/databases/postgresql14-server/files/postgresql.in
@@ -41,7 +41,7 @@ eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%"
 
 name=postgresql
 rcvar=postgresql_enable
-extra_commands="reload initdb"
+extra_commands="reload initdb promote logrotate"
 
 start_cmd="postgresql_command start"
 stop_cmd="postgresql_command stop"
@@ -49,6 +49,7 @@ restart_cmd="postgresql_command restart"
 reload_cmd="postgresql_command reload"
 status_cmd="postgresql_command status"
 promote_cmd="postgresql_command promote"
+logrotate_cmd="postgresql_command logrotate"
 
 initdb_cmd="postgresql_initdb"
 
diff --git a/databases/postgresql15-contrib/Makefile b/databases/postgresql15-contrib/Makefile
index 029971d32399..8d8803e14f03 100644
--- a/databases/postgresql15-contrib/Makefile
+++ b/databases/postgresql15-contrib/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org
diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile
index 1489747d17ec..e950d4e41615 100644
--- a/databases/postgresql15-server/Makefile
+++ b/databases/postgresql15-server/Makefile
@@ -1,7 +1,7 @@
-DISTVERSION?=	15.13
+DISTVERSION?=	15.14
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	1
+PORTREVISION?=	0
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
@@ -21,4 +21,4 @@ PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
-.include "${.CURDIR}/../postgresql16-server/Makefile"
+.include "${.CURDIR}/../postgresql18-server/Makefile"
diff --git a/databases/postgresql15-server/distinfo b/databases/postgresql15-server/distinfo
index 960718cd0db9..4e815a7c0626 100644
--- a/databases/postgresql15-server/distinfo
+++ b/databases/postgresql15-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746521298
-SHA256 (postgresql/postgresql-15.13.tar.bz2) = 4f62e133d22ea08a0401b0840920e26698644d01a80c34341fb732dd0a90ca5d
-SIZE (postgresql/postgresql-15.13.tar.bz2) = 23190593
+TIMESTAMP = 1755094739
+SHA256 (postgresql/postgresql-15.14.tar.bz2) = 06dd75d305cd3870ee62b3932e661c624543eaf9ae2ba37cdec0a4f8edd051d2
+SIZE (postgresql/postgresql-15.14.tar.bz2) = 23229854
diff --git a/databases/postgresql15-server/files/postgresql.in b/databases/postgresql15-server/files/postgresql.in
index 073d3a64c004..3227deee0b5d 100644
--- a/databases/postgresql15-server/files/postgresql.in
+++ b/databases/postgresql15-server/files/postgresql.in
@@ -41,7 +41,7 @@ eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%"
 
 name=postgresql
 rcvar=postgresql_enable
-extra_commands="reload initdb"
+extra_commands="reload initdb promote logrotate"
 
 start_cmd="postgresql_command start"
 stop_cmd="postgresql_command stop"
@@ -49,6 +49,7 @@ restart_cmd="postgresql_command restart"
 reload_cmd="postgresql_command reload"
 status_cmd="postgresql_command status"
 promote_cmd="postgresql_command promote"
+logrotate_cmd="postgresql_command logrotate"
 
 initdb_cmd="postgresql_initdb"
 
diff --git a/databases/postgresql16-contrib/Makefile b/databases/postgresql16-contrib/Makefile
index e68f712cb309..cd8376580200 100644
--- a/databases/postgresql16-contrib/Makefile
+++ b/databases/postgresql16-contrib/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org
diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile
index 1e20ce62ed3c..d4c26262a6b7 100644
--- a/databases/postgresql16-server/Makefile
+++ b/databases/postgresql16-server/Makefile
@@ -1,49 +1,9 @@
-PORTNAME?=	postgresql
-DISTVERSION?=	16.9
+DISTVERSION?=	16.10
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	1
-CATEGORIES?=	databases
-MASTER_SITES=	PGSQL/source/v${DISTVERSION}
-PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
+PORTREVISION?=	0
 
 MAINTAINER?=	pgsql@FreeBSD.org
-COMMENT?=	PostgreSQL is the most advanced open-source database available anywhere
-WWW=		https://www.postgresql.org/
-
-LICENSE=	PostgreSQL
-
-CONFLICTS+=	${PORTNAME}1[^${PORTVERSION:R:C/.*([0-9]$)/\\1/}]*
-
-WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
-DIST_SUBDIR=	postgresql
-
-OPTIONS_SUB=	yes
-
-PKGINSTALL?=	${PKGDIR}/pkg-install${COMPONENT}
-USES+=		tar:bzip2 cpe
-.if !defined(NO_BUILD)
-USES+=		gmake
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-.endif
-
-PG_USER?=	postgres
-PG_GROUP?=	postgres
-PG_UID?=	770
-
-LDFLAGS+=	-L${LOCALBASE}/lib
-INCLUDES+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
-		--with-includes=${PREFIX}/include \
-		--enable-thread-safety
-CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
-		PTHREAD_LIBS="-lpthread" \
-		LDFLAGS_SL="${LDFLAGS_SL}"
-LDFLAGS+=	-lpthread
-MAKE_ENV=	MAKELEVEL=0
-
-PLIST=		${PKGDIR}/pkg-plist${COMPONENT}
 
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
@@ -57,186 +17,8 @@ INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_upgrade
 
-BUILD_DIRS?=	src/port ${INSTALL_DIRS}
-INSTALL_TARGET?=install-strip
+PG_USER?=	postgres
+PG_GROUP?=	postgres
+PG_UID?=	770
 
-.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
-SERVER_ONLY=	yes
-COMPONENT=	-server
-USE_RC_SUBR=	postgresql
-USES+=		pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
-USERS=		${PG_USER}
-GROUPS=	${PG_GROUP}
-SUB_FILES+=	502.pgsql
-.endif
-
-MAKE_ENV+=	PATH=${PREFIX}/bin:${PATH}
-CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
-
-.if defined(SERVER_ONLY)
-OPTIONS_DEFINE=	DTRACE LDAP TZDATA XML DOCS
-OPTIONS_DEFAULT+=XML
-LDAP_DESC=	Build with LDAP authentication support
-TZDATA_DESC=	Use internal timezone database
-XML_DESC=	Build with XML data type
-
-DTRACE_CONFIGURE_ENABLE=dtrace
-DTRACE_LDFLAGS=		-lelf
-DTRACE_INSTALL_TARGET=	install
-
-.  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 14
-OPTIONS_DEFINE+=	LZ4
-OPTIONS_DEFAULT+=	LZ4
-LZ4_DESC=		Build with LZ4 compression support
-LZ4_CONFIGURE_WITH=	lz4
-LZ4_LIB_DEPENDS+=	liblz4.so:archivers/liblz4
-.  endif
-
-.  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 15
-OPTIONS_DEFINE+=	ZSTD
-OPTIONS_DEFAULT+=	ZSTD
-ZSTD_DESC=		Build with ZSTD compression support
-ZSTD_CONFIGURE_WITH=	zstd
-ZSTD_LIB_DEPENDS+=	libzstd.so:archivers/zstd
-.  endif
-
-OPTIONS_DEFINE+=	LLVM
-OPTIONS_DEFAULT+=	LLVM
-LLVM_DESC=		Build with support for JIT-compiling expressions
-LLVM_CONFIGURE_WITH=	llvm
-LLVM_CONFIGURE_ENV=	LLVM_CONFIG=${LLVM_CONFIG} \
-			CLANG=${LOCALBASE}/bin/clang${LLVM_VERSION}
-LLVM_USES=		llvm:min=11,lib
-
-CONFIGURE_ARGS+=	--with-icu
-LIB_DEPENDS+=		libicudata.so:devel/icu
-USES+=			pkgconfig
-.else
-CONFIGURE_ARGS+=	--without-icu
-.endif
-
-
-.if !defined(SLAVE_ONLY)
-OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS SSL
-NLS_DESC=		Use internationalized messages
-PAM_DESC=		Build with PAM Support
-GSSAPI_DESC=		Build with GSSAPI from base (security/krb5)
-OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
-SSL_DESC=		Build with OpenSSL support
-
-OPTIONS_DEFAULT+=	SSL
-
-GSSAPI_USES=		gssapi:mit
-GSSAPI_CONFIGURE_WITH=	gssapi
-.endif # !SLAVE_ONLY
-
-SSL_USES=		ssl
-SSL_CONFIGURE_WITH=	openssl
-
-PAM_CONFIGURE_WITH=	pam
-
-XML_CONFIGURE_WITH=	libxml
-XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
-
-TZDATA_CONFIGURE_OFF=	--with-system-tzdata=/usr/share/zoneinfo
-
-NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=		gettext
-
-LDAP_CONFIGURE_WITH=	ldap
-LDAP_USES=		ldap
-
-OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops
-
-DEBUG_CONFIGURE_ENABLE=	debug
-
-PLIST_SUB+=		PG_VERSION=${PORTVERSION:R} \
-			PG_USER=${PG_USER} \
-			PG_USER_regex=[[:<:]]${PG_USER}[[:>:]] \
-			PG_GROUP=${PG_GROUP} \
-			PG_GROUP_regex=[[:<:]]${PG_GROUP}[[:>:]]
-SUB_LIST+=		PG_VERSION=${PORTVERSION:R} \
-			PG_GROUP=${PG_GROUP} \
-			PG_USER=${PG_USER} \
-			PG_UID=${PG_UID}
-
-.include <bsd.port.options.mk>
-
-# i386 older than Pentium lacks SSE2 so the binary will not run if we build with clang -msse2
-# For such ancient CPUs, gcc must be used to build PostgreSQL.
-# https://www.postgresql.org/message-id/20190307140421.GA8362%40gate.oper.dinoex.org
-.if ${ARCH} == "i386"
-CFLAGS+=	-msse2
-.endif
-
-.if !defined(SLAVE_ONLY)
-PATCH_DIST_STRIP=-p1
-.endif # !SLAVE_ONLY
-
-# For testing files in FILESDIR
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MLLVM}
-INSTALL_DIRS+=		src/backend/jit/llvm
-.endif
-
-.if defined(SERVER_ONLY)
-pre-build:
-	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
-.endif
-
-.if !defined(NO_BUILD) && !target(do-build)
-
-do-build:
-	@ cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers
-	@ for dir in ${BUILD_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ; \
-	done
-
-.  if exists(${FILESDIR}/pkg-message${COMPONENT}.in)
-SUB_FILES+=	pkg-message${COMPONENT}
-PKGMESSAGE=	${WRKSRC}/pkg-message${COMPONENT}
-.  endif
-.  if exists(${FILESDIR}/pkg-install${COMPONENT}.in)
-SUB_FILES+=	pkg-install${COMPONENT}
-.  endif
-
-post-patch:
-.  if defined(CLIENT_ONLY) && !defined(OPENSSL_PORT)
-	@${REINPLACE_CMD} \
-		-e '/^PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto/d' \
-		${WRKSRC}/src/interfaces/libpq/Makefile
-.  endif
-
-do-install:
-	@for dir in ${INSTALL_DIRS}; do \
-	    cd ${WRKSRC}/$${dir} && \
-		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \
-	done
-.  if defined(SERVER_ONLY)
-	@ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\
-	${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \
-			${STAGEDIR}${PREFIX}/etc/periodic/daily
-.  endif # SERVER_ONLY
-.  if defined(CLIENT_ONLY)
-	@ cd ${WRKSRC}/src && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
-.  endif
-	@ if [ -r ${PKGMESSAGE} ]; then \
-		${MKDIR} ${STAGEDIR}${DOCSDIR} ;\
-		${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\
-	fi
-.endif # !NO_BUILD
-
-.if defined(SERVER_ONLY)
-check:
-	@if [ `id -u` != 0 ] ; then \
-	  ${ECHO} "Running postgresql regressions tests" ;\
-	  cd ${WRKSRC}; ${MAKE_CMD} check ;\
-	 else \
-	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
-	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
-	 fi
-.endif
-
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../postgresql18-server/Makefile"
diff --git a/databases/postgresql16-server/distinfo b/databases/postgresql16-server/distinfo
index 802a569e97b5..6ecd7bbec6aa 100644
--- a/databases/postgresql16-server/distinfo
+++ b/databases/postgresql16-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746521299
-SHA256 (postgresql/postgresql-16.9.tar.bz2) = 07c00fb824df0a0c295f249f44691b86e3266753b380c96f633c3311e10bd005
-SIZE (postgresql/postgresql-16.9.tar.bz2) = 24936316
+TIMESTAMP = 1755094740
+SHA256 (postgresql/postgresql-16.10.tar.bz2) = de8485f4ce9c32e3ddfeef0b7c261eed1cecb54c9bcd170e437ff454cb292b42
+SIZE (postgresql/postgresql-16.10.tar.bz2) = 24977722
diff --git a/databases/postgresql16-server/files/postgresql.in b/databases/postgresql16-server/files/postgresql.in
index 073d3a64c004..3227deee0b5d 100644
--- a/databases/postgresql16-server/files/postgresql.in
+++ b/databases/postgresql16-server/files/postgresql.in
@@ -41,7 +41,7 @@ eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%"
 
 name=postgresql
 rcvar=postgresql_enable
-extra_commands="reload initdb"
+extra_commands="reload initdb promote logrotate"
 
 start_cmd="postgresql_command start"
 stop_cmd="postgresql_command stop"
@@ -49,6 +49,7 @@ restart_cmd="postgresql_command restart"
 reload_cmd="postgresql_command reload"
 status_cmd="postgresql_command status"
 promote_cmd="postgresql_command promote"
+logrotate_cmd="postgresql_command logrotate"
 
 initdb_cmd="postgresql_initdb"
 
diff --git a/databases/postgresql17-contrib/Makefile b/databases/postgresql17-contrib/Makefile
index 001c798933c8..1a55a4cc9a46 100644
--- a/databases/postgresql17-contrib/Makefile
+++ b/databases/postgresql17-contrib/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org
diff --git a/databases/postgresql17-server/Makefile b/databases/postgresql17-server/Makefile
index 1513d79a35d9..6bd13e163497 100644
--- a/databases/postgresql17-server/Makefile
+++ b/databases/postgresql17-server/Makefile
@@ -1,51 +1,9 @@
-PORTNAME?=	postgresql
-DISTVERSION?=	17.5
+DISTVERSION?=	17.6
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	1
-CATEGORIES?=	databases
-MASTER_SITES=	PGSQL/source/v${DISTVERSION}
-#DISTFILES+=	${PORTNAME}-${DISTVERSION}-docs.tar.bz:docs
-PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
+PORTREVISION?=	0
 
 MAINTAINER?=	pgsql@FreeBSD.org
-COMMENT?=	PostgreSQL is the most advanced open-source database available anywhere
-WWW=		https://www.postgresql.org/
-
-LICENSE=	PostgreSQL
-
-CONFLICTS+=	${PORTNAME}1[^${PORTVERSION:R:C/.*([0-9]$)/\\1/}]*
-
-WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
-DIST_SUBDIR=	postgresql
-
-OPTIONS_SUB=	yes
-
-PKGINSTALL?=	${PKGDIR}/pkg-install${COMPONENT}
-USES+=		bison perl5 tar:bzip2 cpe
-USE_PERL5=	build
-.if !defined(NO_BUILD)
-USES+=		gmake
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-.endif
-
-PG_USER?=	postgres
-PG_GROUP?=	postgres
-PG_UID?=	770
-
-LDFLAGS+=	-L${LOCALBASE}/lib
-INCLUDES+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
-		--with-includes=${PREFIX}/include \
-		--enable-thread-safety
-CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
-		PTHREAD_LIBS="-lpthread" \
-		LDFLAGS_SL="${LDFLAGS_SL}"
-LDFLAGS+=	-lpthread
-MAKE_ENV=	MAKELEVEL=0
-
-PLIST=		${PKGDIR}/pkg-plist${COMPONENT}
 
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
@@ -53,193 +11,14 @@ INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/replication/pgoutput \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_archivecleanup src/bin/pg_basebackup \
-		src/bin/pg_checksums \
+		src/bin/pg_checksums src/bin/pg_combinebackup \
 		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
 		src/bin/pg_rewind \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
-		src/bin/pg_waldump src/bin/pg_upgrade
+		src/bin/pg_waldump src/bin/pg_walsummary src/bin/pg_upgrade
 
-BUILD_DIRS?=	src/port ${INSTALL_DIRS}
-INSTALL_TARGET?=install-strip
+PG_USER?=	postgres
+PG_GROUP?=	postgres
+PG_UID?=	770
 
-.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
-SERVER_ONLY=	yes
-COMPONENT=	-server
-USE_RC_SUBR=	postgresql
-USES+=		pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
-USERS=		${PG_USER}
-GROUPS=	${PG_GROUP}
-SUB_FILES+=	502.pgsql
-.endif
-
-MAKE_ENV+=	PATH=${PREFIX}/bin:${PATH}
-CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
-
-.if defined(SERVER_ONLY)
-OPTIONS_DEFINE=	DTRACE LDAP TZDATA XML DOCS
-OPTIONS_DEFAULT+=XML
-LDAP_DESC=	Build with LDAP authentication support
-TZDATA_DESC=	Use internal timezone database
-XML_DESC=	Build with XML data type
-
-DTRACE_CONFIGURE_ENABLE=dtrace
-DTRACE_LDFLAGS=		-lelf
-DTRACE_INSTALL_TARGET=	install
-
-.  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 14
-OPTIONS_DEFINE+=	LZ4
-OPTIONS_DEFAULT+=	LZ4
-LZ4_DESC=		Build with LZ4 compression support
-LZ4_CONFIGURE_WITH=	lz4
-LZ4_LIB_DEPENDS+=	liblz4.so:archivers/liblz4
-.  endif
-
-.  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 15
-OPTIONS_DEFINE+=	ZSTD
-OPTIONS_DEFAULT+=	ZSTD
-ZSTD_DESC=		Build with ZSTD compression support
-ZSTD_CONFIGURE_WITH=	zstd
-ZSTD_LIB_DEPENDS+=	libzstd.so:archivers/zstd
-.  endif
-
-OPTIONS_DEFINE+=	LLVM
-OPTIONS_DEFAULT+=	LLVM
-LLVM_DESC=		Build with support for JIT-compiling expressions
-LLVM_CONFIGURE_WITH=	llvm
-LLVM_CONFIGURE_ENV=	LLVM_CONFIG=${LLVM_CONFIG} \
-			CLANG=${LOCALBASE}/bin/clang${LLVM_VERSION}
-LLVM_USES=		llvm:min=11,lib
-
-CONFIGURE_ARGS+=	--with-icu
-LIB_DEPENDS+=		libicudata.so:devel/icu
-USES+=			pkgconfig
-.else
-CONFIGURE_ARGS+=	--without-icu
-.endif
-
-
-.if !defined(SLAVE_ONLY)
-OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS SSL
-NLS_DESC=		Use internationalized messages
-PAM_DESC=		Build with PAM Support
-GSSAPI_DESC=		Build with GSSAPI from base (security/krb5)
-OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
-SSL_DESC=		Build with OpenSSL support
-
-OPTIONS_DEFAULT+=	SSL
-
-GSSAPI_USES=		gssapi:mit
-GSSAPI_CONFIGURE_WITH=	gssapi
-
-PATCH_DIST_STRIP=-p1
-.endif # !SLAVE_ONLY
-
-SSL_USES=		ssl
-SSL_CONFIGURE_WITH=	openssl
-
-PAM_CONFIGURE_WITH=	pam
-
-XML_CONFIGURE_WITH=	libxml
-XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
-
-TZDATA_CONFIGURE_OFF=	--with-system-tzdata=/usr/share/zoneinfo
-
-NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=		gettext
-
-LDAP_CONFIGURE_WITH=	ldap
-LDAP_USES=		ldap
-
-OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops
-
-DEBUG_CONFIGURE_ENABLE=	debug
-
-PLIST_SUB+=		PG_VERSION=${PORTVERSION:R} \
-			PG_USER=${PG_USER} \
-			PG_USER_regex=[[:<:]]${PG_USER}[[:>:]] \
-			PG_GROUP=${PG_GROUP} \
-			PG_GROUP_regex=[[:<:]]${PG_GROUP}[[:>:]]
-SUB_LIST+=		PG_VERSION=${PORTVERSION:R} \
-			PG_GROUP=${PG_GROUP} \
-			PG_USER=${PG_USER} \
-			PG_UID=${PG_UID}
-
-.include <bsd.port.options.mk>
-
-# i386 older than Pentium lacks SSE2 so the binary will not run if we build with clang -msse2
-# For such ancient CPUs, gcc must be used to build PostgreSQL.
-# https://www.postgresql.org/message-id/20190307140421.GA8362%40gate.oper.dinoex.org
-.if ${ARCH} == "i386"
-CFLAGS+=	-msse2
-.endif
-
-# For testing files in FILESDIR
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MLLVM}
-INSTALL_DIRS+=		src/backend/jit/llvm
-.endif
-
-.if defined(SERVER_ONLY)
-pre-build:
-	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
-.endif
-
-.if !defined(NO_BUILD) && !target(do-build)
-
-do-build:
-	@ cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers
-	@ for dir in ${BUILD_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ; \
-	done
-.  if defined(CLIENT_ONLY)
-	@ cd ${WRKSRC}/doc && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} man
-.  endif
-.  if exists(${FILESDIR}/pkg-message${COMPONENT}.in)
-SUB_FILES+=	pkg-message${COMPONENT}
-PKGMESSAGE=	${WRKSRC}/pkg-message${COMPONENT}
-.  endif
-.  if exists(${FILESDIR}/pkg-install${COMPONENT}.in)
-SUB_FILES+=	pkg-install${COMPONENT}
-.  endif
-
-post-patch:
-.  if defined(CLIENT_ONLY) && !defined(OPENSSL_PORT)
-	@${REINPLACE_CMD} \
-		-e '/^PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto/d' \
-		${WRKSRC}/src/interfaces/libpq/Makefile
-.  endif
-
-do-install:
-	@for dir in ${INSTALL_DIRS}; do \
-	    cd ${WRKSRC}/$${dir} && \
-		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \
-	done
-.  if defined(SERVER_ONLY)
-	@ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\
-	${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \
-			${STAGEDIR}${PREFIX}/etc/periodic/daily
-.  endif # SERVER_ONLY
-.  if defined(CLIENT_ONLY)
-	@ cd ${WRKSRC}/src && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
-	@ cd ${WRKSRC}/doc/src/sgml && ${COPYTREE_SHARE} "man1 man3 man7" ${STAGEDIR}${PREFIX}/share/man
-.  endif
-	@ if [ -r ${PKGMESSAGE} ]; then \
-		${MKDIR} ${STAGEDIR}${DOCSDIR} ;\
-		${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\
-	fi
-.endif # !NO_BUILD
-
-.if defined(SERVER_ONLY)
-check:
-	@if [ `id -u` != 0 ] ; then \
-	  ${ECHO} "Running postgresql regressions tests" ;\
-	  cd ${WRKSRC}; ${MAKE_CMD} check ;\
-	 else \
-	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
-	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
-	 fi
-.endif
-
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../postgresql18-server/Makefile"
diff --git a/databases/postgresql17-server/distinfo b/databases/postgresql17-server/distinfo
index ab999c575a5f..2fabee2e9842 100644
--- a/databases/postgresql17-server/distinfo
+++ b/databases/postgresql17-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746521300
-SHA256 (postgresql/postgresql-17.5.tar.bz2) = fcb7ab38e23b264d1902cb25e6adafb4525a6ebcbd015434aeef9eda80f528d8
-SIZE (postgresql/postgresql-17.5.tar.bz2) = 21595174
+TIMESTAMP = 1755094741
+SHA256 (postgresql/postgresql-17.6.tar.bz2) = e0630a3600aea27511715563259ec2111cd5f4353a4b040e0be827f94cd7a8b0
+SIZE (postgresql/postgresql-17.6.tar.bz2) = 21623975
diff --git a/databases/postgresql17-server/files/postgresql.in b/databases/postgresql17-server/files/postgresql.in
index 073d3a64c004..3227deee0b5d 100644
--- a/databases/postgresql17-server/files/postgresql.in
+++ b/databases/postgresql17-server/files/postgresql.in
@@ -41,7 +41,7 @@ eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%"
 
 name=postgresql
 rcvar=postgresql_enable
-extra_commands="reload initdb"
+extra_commands="reload initdb promote logrotate"
 
 start_cmd="postgresql_command start"
 stop_cmd="postgresql_command stop"
@@ -49,6 +49,7 @@ restart_cmd="postgresql_command restart"
 reload_cmd="postgresql_command reload"
 status_cmd="postgresql_command status"
 promote_cmd="postgresql_command promote"
+logrotate_cmd="postgresql_command logrotate"
 
 initdb_cmd="postgresql_initdb"
 
diff --git a/databases/postgresql17-server/pkg-plist-server b/databases/postgresql17-server/pkg-plist-server
index 0ee593624118..fc8fabc8df4f 100644
--- a/databases/postgresql17-server/pkg-plist-server
+++ b/databases/postgresql17-server/pkg-plist-server
@@ -2,6 +2,7 @@ bin/initdb
 bin/pg_archivecleanup
 bin/pg_basebackup
 bin/pg_checksums
+bin/pg_combinebackup
 bin/pg_controldata
 bin/pg_createsubscriber
 bin/pg_ctl
@@ -13,6 +14,7 @@ bin/pg_test_fsync
 bin/pg_test_timing
 bin/pg_upgrade
 bin/pg_waldump
+bin/pg_walsummary
 bin/postgres
 etc/periodic/daily/502.pgsql
 include/postgresql/server/plpgsql.h
@@ -841,6 +843,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_combinebackup-17.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -849,6 +852,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_walsummary-17.mo
 %%NLS%%share/locale/de/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/el/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
@@ -867,6 +871,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_combinebackup-17.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -875,12 +880,14 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_walsummary-17.mo
 %%NLS%%share/locale/es/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_combinebackup-17.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -889,6 +896,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_walsummary-17.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/he/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
@@ -912,6 +920,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_combinebackup-17.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -920,12 +929,14 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_walsummary-17.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_combinebackup-17.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -934,12 +945,14 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_walsummary-17.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_combinebackup-17.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -948,6 +961,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_walsummary-17.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/%%PG_USER%%-%%PG_VERSION%%.mo
@@ -978,6 +992,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_combinebackup-17.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -986,12 +1001,14 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_walsummary-17.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_combinebackup-17.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -1000,6 +1017,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_walsummary-17.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/%%PG_USER%%-%%PG_VERSION%%.mo
@@ -1020,6 +1038,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_combinebackup-17.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -1028,6 +1047,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_walsummary-17.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
diff --git a/databases/postgresql18-server/Makefile b/databases/postgresql18-server/Makefile
index f37ff4e3db81..43cc1ca227e2 100644
--- a/databases/postgresql18-server/Makefile
+++ b/databases/postgresql18-server/Makefile
@@ -1,11 +1,10 @@
 PORTNAME?=	postgresql
-DISTVERSION?=	18beta2
+DISTVERSION?=	18beta3
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
-#DISTFILES+=	${PORTNAME}-${DISTVERSION}-docs.tar.bz:docs
 PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
@@ -22,8 +21,12 @@ DIST_SUBDIR=	postgresql
 OPTIONS_SUB=	yes
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${COMPONENT}
-USES+=		bison perl5 tar:bzip2 cpe
+USES+=		tar:bzip2 cpe
+.if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 17
+USES+=		bison perl5
 USE_PERL5=	build
+.endif
+
 .if !defined(NO_BUILD)
 USES+=		gmake
 GNU_CONFIGURE=	yes
@@ -53,11 +56,11 @@ INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/replication/pgoutput \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_archivecleanup src/bin/pg_basebackup \
-		src/bin/pg_checksums \
+		src/bin/pg_checksums src/bin/pg_combinebackup \
 		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
 		src/bin/pg_rewind \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
-		src/bin/pg_waldump src/bin/pg_upgrade
+		src/bin/pg_waldump src/bin/pg_walsummary src/bin/pg_upgrade
 
 BUILD_DIRS?=	src/port ${INSTALL_DIRS}
 INSTALL_TARGET?=install-strip
@@ -68,7 +71,7 @@ COMPONENT=	-server
 USE_RC_SUBR=	postgresql
 USES+=		pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
 USERS=		${PG_USER}
-GROUPS=	${PG_GROUP}
+GROUPS=		${PG_GROUP}
 SUB_FILES+=	502.pgsql
 .endif
 
@@ -94,14 +97,6 @@ LZ4_CONFIGURE_WITH=	lz4
 LZ4_LIB_DEPENDS+=	liblz4.so:archivers/liblz4
 .  endif
 
-.  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 15
-OPTIONS_DEFINE+=	ZSTD
-OPTIONS_DEFAULT+=	ZSTD
-ZSTD_DESC=		Build with ZSTD compression support
-ZSTD_CONFIGURE_WITH=	zstd
-ZSTD_LIB_DEPENDS+=	libzstd.so:archivers/zstd
-.  endif
-
 OPTIONS_DEFINE+=	LLVM
 OPTIONS_DEFAULT+=	LLVM
 LLVM_DESC=		Build with support for JIT-compiling expressions
@@ -134,6 +129,20 @@ GSSAPI_CONFIGURE_WITH=	gssapi
 PATCH_DIST_STRIP=-p1
 .endif # !SLAVE_ONLY
 
+.if defined(SERVER_ONLY) || defined(CLIENT_ONLY) || ${COMPONENT} == "-contrib"
+.  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 15
+OPTIONS_DEFINE+=	ZSTD
+OPTIONS_DEFAULT+=	ZSTD
+ZSTD_DESC=		Build with ZSTD compression support
+ZSTD_CONFIGURE_WITH=	zstd
+ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
+USES+=			pkgconfig
+#ZSTD_CFLAGS=		-I${LOCALBASE}/include
+#ZSTD_LDFLAGS=		-L${LOCALBASE}/lib
+#ZSTD_LIBS=		-lzstd
+.  endif
+.endif
+
 SSL_USES=		ssl
 SSL_CONFIGURE_WITH=	openssl
 
@@ -193,7 +202,9 @@ do-build:
 		cd ${WRKSRC}/$${dir} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ; \
 	done
 .  if defined(CLIENT_ONLY)
+.    if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 17
 	@ cd ${WRKSRC}/doc && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} man
+.    endif
 .  endif
 .  if exists(${FILESDIR}/pkg-message${COMPONENT}.in)
 SUB_FILES+=	pkg-message${COMPONENT}
@@ -223,7 +234,9 @@ do-install:
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
 	@ cd ${WRKSRC}/src && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
+.    if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 17
 	@ cd ${WRKSRC}/doc/src/sgml && ${COPYTREE_SHARE} "man1 man3 man7" ${STAGEDIR}${PREFIX}/share/man
+.    endif
 .  endif
 	@ if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${STAGEDIR}${DOCSDIR} ;\
diff --git a/databases/postgresql18-server/distinfo b/databases/postgresql18-server/distinfo
index b2f701a8f3c9..84f26154c262 100644
--- a/databases/postgresql18-server/distinfo
+++ b/databases/postgresql18-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1754318436
-SHA256 (postgresql/postgresql-18beta2.tar.bz2) = 1d16b58244b630194432b88d9ff25f5fea85a001ff2c715a157d4be6787f3075
-SIZE (postgresql/postgresql-18beta2.tar.bz2) = 22319023
+TIMESTAMP = 1755094742
+SHA256 (postgresql/postgresql-18beta3.tar.bz2) = 21d86e55eea11300c3a2212647dc3d48bd844b83017cf6ce5684639ad8f95278
+SIZE (postgresql/postgresql-18beta3.tar.bz2) = 22326308
diff --git a/databases/postgresql18-server/files/postgresql.in b/databases/postgresql18-server/files/postgresql.in
index 073d3a64c004..3227deee0b5d 100644
--- a/databases/postgresql18-server/files/postgresql.in
+++ b/databases/postgresql18-server/files/postgresql.in
@@ -41,7 +41,7 @@ eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%"
 
 name=postgresql
 rcvar=postgresql_enable
-extra_commands="reload initdb"
+extra_commands="reload initdb promote logrotate"
 
 start_cmd="postgresql_command start"
 stop_cmd="postgresql_command stop"
@@ -49,6 +49,7 @@ restart_cmd="postgresql_command restart"
 reload_cmd="postgresql_command reload"
 status_cmd="postgresql_command status"
 promote_cmd="postgresql_command promote"
+logrotate_cmd="postgresql_command logrotate"
 
 initdb_cmd="postgresql_initdb"
 
diff --git a/databases/postgresql18-server/pkg-plist-server b/databases/postgresql18-server/pkg-plist-server
index 04c10757434f..4cb29081b15a 100644
--- a/databases/postgresql18-server/pkg-plist-server
+++ b/databases/postgresql18-server/pkg-plist-server
@@ -2,6 +2,7 @@ bin/initdb
 bin/pg_archivecleanup
 bin/pg_basebackup
 bin/pg_checksums
+bin/pg_combinebackup
 bin/pg_controldata
 bin/pg_createsubscriber
 bin/pg_ctl
@@ -13,6 +14,7 @@ bin/pg_test_fsync
 bin/pg_test_timing
 bin/pg_upgrade
 bin/pg_waldump
+bin/pg_walsummary
 bin/postgres
 etc/periodic/daily/502.pgsql
 include/postgresql/server/plpgsql.h
@@ -868,6 +870,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_combinebackup-18.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -876,6 +879,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_walsummary-18.mo
 %%NLS%%share/locale/de/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/de/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/el/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
@@ -894,6 +898,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_combinebackup-18.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -902,12 +907,14 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_walsummary-18.mo
 %%NLS%%share/locale/es/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/es/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_combinebackup-18.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -916,6 +923,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_walsummary-18.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/he/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
@@ -939,6 +947,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_combinebackup-18.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -947,12 +956,14 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_walsummary-18.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_combinebackup-18.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -961,12 +972,14 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_walsummary-18.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_combinebackup-18.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -975,6 +988,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_walsummary-18.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/%%PG_USER%%-%%PG_VERSION%%.mo
@@ -1005,6 +1019,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_combinebackup-18.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -1013,12 +1028,14 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_walsummary-18.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_combinebackup-18.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -1027,6 +1044,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_walsummary-18.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/%%PG_USER%%-%%PG_VERSION%%.mo
@@ -1047,6 +1065,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_combinebackup-18.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
@@ -1055,6 +1074,7 @@ lib/postgresql/utf8_and_win.so
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_walsummary-18.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/initdb-%%PG_VERSION%%.mo