diff --git a/net/py-python-glanceclient/Makefile b/net/py-python-glanceclient/Makefile
index 976a8fb40817..76b06b2e59fd 100644
--- a/net/py-python-glanceclient/Makefile
+++ b/net/py-python-glanceclient/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	python-glanceclient
-PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTVERSION=	2.10.0
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,22 +10,49 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	alexander.nusov@nfvexpress.com
 COMMENT=	Client for the OpenStack Glance API
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}warlock>=0:devel/py-warlock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR}
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.3.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openssl>=16.2.0:security/py-openssl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}prettytable>=0.7.1:devel/py-prettytable@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}warlock>=1.2.0:devel/py-warlock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wrapt>=1.7.0:devel/py-wrapt@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
 
-USES=		python shebangfix
-SHEBANG_FILES=	glanceclient/tests/functional/hooks/post_test_hook.sh
-USE_PYTHON=	distutils autoplist noegginfo
 NO_ARCH=	yes
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.3.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=1.18.1:textproc/py-openstackdocstheme@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}prettytable>=0.7.1:devel/py-prettytable@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}sphinx>=1.6.2:textproc/py-sphinx@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}warlock>=1.2.0:devel/py-warlock@${PY_FLAVOR}
+DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,install_requires.*,,' ${WRKSRC}/setup.py
+	# Set ETCDIR to ${PREFIX}/etc
+	@${FIND} ${WRKSRC}/doc/source/ -name "*.rst" -print0 | \
+		${XARGS} -0 ${REINPLACE_CMD} -Ee \
+			"s|(/etc/glance)|${PREFIX}\1|g"
+	@${REINPLACE_CMD} -Ee "s|(/etc/glance)|${PREFIX}\1|g" \
+		${WRKSRC}/glanceclient/shell.py
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc/build/html && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
+			"! -name .buildinfo -and ! -name objects.inv")
 
 .include <bsd.port.mk>
diff --git a/net/py-python-glanceclient/distinfo b/net/py-python-glanceclient/distinfo
index 511fe89ff44f..4944d6ae491c 100644
--- a/net/py-python-glanceclient/distinfo
+++ b/net/py-python-glanceclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475931722
-SHA256 (python-glanceclient-2.5.0.tar.gz) = 8c510a089fb4dc8355d5db0de608361888b5e4e0c81e0d153ae1b1366bfb8a08
-SIZE (python-glanceclient-2.5.0.tar.gz) = 157864
+TIMESTAMP = 1530138375
+SHA256 (python-glanceclient-2.10.0.tar.gz) = 4f2e7db4b9e31e11f7f77b3c50d8f642246b65866a908e588c17c0c9fa6aec6a
+SIZE (python-glanceclient-2.10.0.tar.gz) = 180299
diff --git a/net/py-python-glanceclient/pkg-descr b/net/py-python-glanceclient/pkg-descr
index df18385d60f2..5c348a471696 100644
--- a/net/py-python-glanceclient/pkg-descr
+++ b/net/py-python-glanceclient/pkg-descr
@@ -1,5 +1,5 @@
-This is a client for the OpenStack Glance API. There's a Python
-API (the glanceclient module), and a command-line script (glance).
-Each implements 100% of the OpenStack Glance API.
+Client for the OpenStack Glance API. There's a Python API (the glanceclient
+module), and a command-line script (glance). Each implements 100% of the
+OpenStack Glance API.
 
-WWW: https://pypi.org/project/python-glanceclient/
+WWW: https://docs.openstack.org/python-glanceclient/