diff --git a/databases/postgis25/Makefile b/databases/postgis25/Makefile
index 41f0abb8011a..24115049ca4f 100644
--- a/databases/postgis25/Makefile
+++ b/databases/postgis25/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgis
-PORTVERSION=	2.5.4
-PORTREVISION=	2
+PORTVERSION=	2.5.5
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	25
diff --git a/databases/postgis25/distinfo b/databases/postgis25/distinfo
index 1a07061281ac..ce3cf55230bf 100644
--- a/databases/postgis25/distinfo
+++ b/databases/postgis25/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586024296
-SHA256 (postgis-2.5.4.tar.gz) = 146d59351cf830e2a2a72fa14e700cd5eab6c18ad3e7c644f57c4cee7ed98bbe
-SIZE (postgis-2.5.4.tar.gz) = 15882033
+TIMESTAMP = 1598844274
+SHA256 (postgis-2.5.5.tar.gz) = 1217a0212aaa143e44831849d1845b198f248923d7e96634219d3369a6ec8714
+SIZE (postgis-2.5.5.tar.gz) = 15936193
diff --git a/databases/postgis25/pkg-plist b/databases/postgis25/pkg-plist
index 8c3f84e7f192..ab03d896a86c 100644
--- a/databases/postgis25/pkg-plist
+++ b/databases/postgis25/pkg-plist
@@ -158,6 +158,7 @@ share/postgresql/contrib/postgis-%%VER%%/uninstall_rtpostgis.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.8--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.9--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.11--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.0--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.1--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.2--%%PORTVERSION%%.sql
@@ -167,14 +168,15 @@ share/postgresql/contrib/postgis-%%VER%%/uninstall_rtpostgis.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.6--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.7--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.9--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.0--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.1--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.2--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.4--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--ANY--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer.control
 %%ADDRSTD%%share/postgresql/extension/address_standardizer.sql
@@ -221,6 +223,7 @@ share/postgresql/extension/postgis--2.3.7--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.3.8--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.3.9--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.3.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.11--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.2--%%PORTVERSION%%.sql
@@ -230,13 +233,14 @@ share/postgresql/extension/postgis--2.4.5--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.6--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.7--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.9--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.4--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--ANY--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
@@ -279,6 +283,7 @@ share/postgresql/extension/postgis.control
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.8--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.9--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.10--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.11--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.0--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.1--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.2--%%PORTVERSION%%.sql
@@ -288,13 +293,14 @@ share/postgresql/extension/postgis.control
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.6--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.7--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.9--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.0--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.1--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.2--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.4--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--ANY--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged--%%PORTVERSION%%.sql
@@ -337,6 +343,7 @@ share/postgresql/extension/postgis_tiger_geocoder--2.3.7--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.3.8--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.3.9--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.3.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.11--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.2--%%PORTVERSION%%.sql
@@ -346,13 +353,14 @@ share/postgresql/extension/postgis_tiger_geocoder--2.4.5--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.6--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.7--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.9--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.4--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--ANY--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--unpackaged--%%PORTVERSION%%.sql
@@ -395,6 +403,7 @@ share/postgresql/extension/postgis_tiger_geocoder.control
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.8--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.9--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.10--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.11--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.0--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.1--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.2--%%PORTVERSION%%.sql
@@ -404,13 +413,14 @@ share/postgresql/extension/postgis_tiger_geocoder.control
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.6--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.7--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.9--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.0--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.1--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.2--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.4--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--ANY--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql