diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile
index 392fde0e1183..5f0a29d74dc2 100644
--- a/databases/pgbarman/Makefile
+++ b/databases/pgbarman/Makefile
@@ -1,65 +1,65 @@
 # Created by: Matthew Seaman
 
 PORTNAME=		barman
 DISTVERSIONPREFIX=	release/
-DISTVERSION=		2.17
+DISTVERSION=		2.18
 CATEGORIES=		databases
 PKGNAMEPREFIX=		pg
 PKGNAMESUFFIX=		${PYTHON_PKGNAMESUFFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Backup and recovery manager for PostgreSQL
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	rsync:net/rsync									\
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.4.2:databases/py-psycopg2@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}		\
 		${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${PY_FLAVOR}
 
 USES=		pgsql python:3.7+
 USE_PYTHON=	autoplist distutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	EnterpriseDB
 
 WANT_PGSQL=	client
 NO_ARCH=	yes
 
 USERS=		barman
 GROUPS=		barman
 
 OPTIONS_DEFINE=		DOCS
 
 DOCS_DESC=	Install PDF manual
 DOCS_VARS=	PORTDOCS=barman-${DISTVERSION}-manual.pdf \
 		MASTER_SITES+=https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/release%2F${DISTVERSION}/:docs \
 		DISTFILES+=barman-${DISTVERSION}-manual.pdf:docs \
 		EXTRACT_ONLY=${DISTNAME}${EXTRACT_SUFX}
 
 .include <bsd.port.pre.mk>
 
 .if ${PGSQL_VER:M9\.[12345]}
 PGUSER=		pgsql
 .else
 PGUSER=		postgres
 .endif
 
 post-extract-DOCS-on:
 	${CP} ${DISTDIR}/${PORTDOCS} ${WRKDIR}/
 
 post-patch:
 	${SED} -i -e "s@%%PREFIX%%@${PREFIX}@" ${WRKSRC}/barman/config.py
 	${SED} -i -e "s@%%PREFIX%%@${PREFIX}@" ${WRKSRC}/doc/barman.conf
 	${SED} -i -e "s@%%PGUSER%%@${PGUSER}@" ${WRKSRC}/doc/barman.5
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/barman.conf \
 		${STAGEDIR}${ETCDIR}/barman.conf.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/databases/pgbarman/distinfo b/databases/pgbarman/distinfo
index 33198a3ea82e..a18cfbc73bbb 100644
--- a/databases/pgbarman/distinfo
+++ b/databases/pgbarman/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1639744625
-SHA256 (barman-2.17-manual.pdf) = 0564e09e06cbec63a4fdd64baa7cae00a5d567a78718e30c26dff9687fbfe0de
-SIZE (barman-2.17-manual.pdf) = 1339247
-SHA256 (EnterpriseDB-barman-release-2.17_GH0.tar.gz) = f8ed145525b4ddc8ad3365964c33eced5559ec1441fcf95b2e28c67f30de6766
-SIZE (EnterpriseDB-barman-release-2.17_GH0.tar.gz) = 1392621
+TIMESTAMP = 1643228211
+SHA256 (barman-2.18-manual.pdf) = 89ab4403e1a780204b8238a663cc73186bbccf78b0a6e062c06d474a9a2595b6
+SIZE (barman-2.18-manual.pdf) = 1343143
+SHA256 (EnterpriseDB-barman-release-2.18_GH0.tar.gz) = 9c2cf5f126e56ef9e7497df4c5a4c056df50b33aef19c0565807eb6c30da8f92
+SIZE (EnterpriseDB-barman-release-2.18_GH0.tar.gz) = 1412704
diff --git a/databases/pgbarman/pkg-descr b/databases/pgbarman/pkg-descr
index 993918f101e1..b9607ddc9e9b 100644
--- a/databases/pgbarman/pkg-descr
+++ b/databases/pgbarman/pkg-descr
@@ -1,11 +1,11 @@
 
 Barman: backup and recovery manager for PostgreSQL.
 
 Barman is an open-source administration tool for disaster recovery of
 PostgreSQL servers written in Python.
 
 It allows your organisation to perform remote backups of multiple
 servers in business critical environments and helps DBAs during the
 recovery phase.
 
-WWW: http://www.pgbarman.org/
+WWW: https://pgbarman.org/