diff --git a/science/py-netCDF4/Makefile b/science/py-netCDF4/Makefile
index 2b75363c2277..a5c30bcd6c17 100644
--- a/science/py-netCDF4/Makefile
+++ b/science/py-netCDF4/Makefile
@@ -1,55 +1,54 @@
 # Created by: Wen Heping <wenheping@gmail.com>
 
 PORTNAME=	netCDF4
-PORTVERSION=	1.5.7
+PORTVERSION=	1.5.8
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	rel
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Python Interface to the NetCDF Library (versions 3 and 4)
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}cftime>=0:devel/py-cftime@${PY_FLAVOR}
 
 USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils cython cython_run
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
+USE_GITHUB=	yes
+GH_ACCOUNT=	Unidata
+GH_PROJECT=	netcdf4-python
+USE_PYTHON=	autoplist concurrent cython cython_run distutils
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-GH_ACCOUNT=	Unidata
-GH_PROJECT=	netcdf4-python
-USE_GITHUB=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${ECHO_CMD} -n > ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "[options]" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "use_ncconfig=True" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "ncconfig=${LOCALBASE}/bin/nc-config" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "[directories]" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "HDF5_libdir=${LOCALBASE}/lib" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "HDF5_incdir=${LOCALBASE}/include" >> ${WRKSRC}/setup.cfg
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/netCDF4/_netCDF4*.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/science/py-netCDF4/distinfo b/science/py-netCDF4/distinfo
index de1a2e66e634..6d339894270f 100644
--- a/science/py-netCDF4/distinfo
+++ b/science/py-netCDF4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633879759
-SHA256 (Unidata-netcdf4-python-v1.5.7rel_GH0.tar.gz) = 5673896d1d39d591423abbd4856270cc901b88bdbeaf4ab293bfd7cfd77fe8d5
-SIZE (Unidata-netcdf4-python-v1.5.7rel_GH0.tar.gz) = 797425
+TIMESTAMP = 1646498769
+SHA256 (Unidata-netcdf4-python-v1.5.8rel_GH0.tar.gz) = c5667abe60888c9207951f4c0d4d0fd058853d4ba5465fe14ea933443ac7522e
+SIZE (Unidata-netcdf4-python-v1.5.8rel_GH0.tar.gz) = 797849