diff --git a/devel/py-python-gitlab/Makefile b/devel/py-python-gitlab/Makefile
index c899bb6033b7..3cc6782a7bf3 100644
--- a/devel/py-python-gitlab/Makefile
+++ b/devel/py-python-gitlab/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	python-gitlab
-PORTVERSION=	2.5.0
+PORTVERSION=	2.6.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,35 +12,37 @@ COMMENT=	Interact with GitLab API
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.9.1:www/py-requests-toolbelt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httmock>0:www/py-httmock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR}
 
 USES=		python:3.6+
-
-OPTIONS_DEFAULT=	AUTOCOMPLETE YAML
-OPTIONS_DEFINE=	AUTOCOMPLETE DOCS YAML
-
-AUTOCOMPLETE_DESC=	Autocompletion via argcomplete
-AUTOCOMPLETE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>=1.10.0<2:devel/py-argcomplete@${PY_FLAVOR}
-
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.7.6,1:textproc/py-sphinx@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
-DOCS_PORTDOCS=	*
-DOCS_VARS=	PYDISTUTILS_BUILD_TARGET=build_sphinx \
-		PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
-
-YAML_DESC=	YAML output
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=5.2:devel/py-yaml@${PY_FLAVOR}
+USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
-USE_PYTHON=	distutils autoplist concurrent
-
 SUB_FILES=	pkg-message
 
+OPTIONS_DEFINE=		AUTOCOMPLETE DOCS YAML
+OPTIONS_DEFAULT=	AUTOCOMPLETE YAML
+
+AUTOCOMPLETE_DESC=		Autocompletion via argcomplete
+YAML_DESC=		YAML output
+
+AUTOCOMPLETE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>=1.10.0<2:devel/py-argcomplete@${PY_FLAVOR}
+
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.9.1:www/py-requests-toolbelt@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}sphinx>=3.2.1,1:textproc/py-sphinx@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-autoprogram>0:textproc/py-sphinxcontrib-autoprogram@${PY_FLAVOR}
+DOCS_PORTDOCS=		*
+DOCS_VARS=		PYDISTUTILS_BUILD_TARGET=build_sphinx \
+			PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
+
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=5.2:devel/py-yaml@${PY_FLAVOR}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}/etc|g' ${WRKSRC}/gitlab/config.py
 
diff --git a/devel/py-python-gitlab/distinfo b/devel/py-python-gitlab/distinfo
index 48018a5d8c28..339881f5607d 100644
--- a/devel/py-python-gitlab/distinfo
+++ b/devel/py-python-gitlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599059372
-SHA256 (python-gitlab-2.5.0.tar.gz) = 68b42aafd4b620ab2534ff78a52584c7f799e4e55d5ac297eab4263066e6f74b
-SIZE (python-gitlab-2.5.0.tar.gz) = 148916
+TIMESTAMP = 1612736602
+SHA256 (python-gitlab-2.6.0.tar.gz) = a862c6874524ab585b725a17b2cd2950fc09d6d74205f40a11be2a4e8f2dcaa1
+SIZE (python-gitlab-2.6.0.tar.gz) = 153577