diff --git a/devel/py-pop/Makefile b/devel/py-pop/Makefile
index 4c766f7c08f4..2e7e57e535ba 100644
--- a/devel/py-pop/Makefile
+++ b/devel/py-pop/Makefile
@@ -1,29 +1,29 @@
 # Created by: Kirill Ponomarev <krion@FreeBSD.org>
 
 PORTNAME=	pop
-PORTVERSION=	17.1
+PORTVERSION=	18.0
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Plugin Oriented Programming interface for Python
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiofiles>=0:devel/py-aiofiles@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiologger>=0:devel/py-aiologger@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dict-toolbox>=0:sysutils/py-dict-toolbox@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pop-config>0:devel/py-pop-config@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python:3.6+ shebangfix
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	saltstack/pop
-GL_COMMIT=	ab9ae13da6087f91edf5465619162141fd1b4e71
+GL_COMMIT=	6be58dfaed42bbb3d0baf39cfa86a6442b7070f8
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pop/distinfo b/devel/py-pop/distinfo
index b1a973e57a3c..716648b60018 100644
--- a/devel/py-pop/distinfo
+++ b/devel/py-pop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618041637
-SHA256 (saltstack/pop-pop-ab9ae13da6087f91edf5465619162141fd1b4e71_GL0.tar.gz) = e8cd8a34d7be559eb588e1d800392ecf2fee9b0598961a04aebcece3e4282094
-SIZE (saltstack/pop-pop-ab9ae13da6087f91edf5465619162141fd1b4e71_GL0.tar.gz) = 117872
+TIMESTAMP = 1620803132
+SHA256 (saltstack/pop-pop-6be58dfaed42bbb3d0baf39cfa86a6442b7070f8_GL0.tar.gz) = 0993eeb2763e4aaac73c15e5ce80ff0d8259b1b2133040b759998705e1676a09
+SIZE (saltstack/pop-pop-6be58dfaed42bbb3d0baf39cfa86a6442b7070f8_GL0.tar.gz) = 95963