diff --git a/science/py-h5py/Makefile b/science/py-h5py/Makefile
index 934b7a7ed0e4..e91569b7b84b 100644
--- a/science/py-h5py/Makefile
+++ b/science/py-h5py/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	h5py
-PORTVERSION=	2.10.0
+PORTVERSION=	3.1.0
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,17 +13,24 @@ COMMENT=	General-purpose Python interface to the HDF5 library
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/licenses/license.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython>=0.29.14:lang/cython@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${PY_FLAVOR} \
 		${RUN_DEPENDS}
 LIB_DEPENDS=	libhdf5.so:science/hdf5
-RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS=	${PYNUMPY}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		pkgconfig python:3.6+
+USES=		localbase pkgconfig python:3.6+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3800
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cached-property>=0:devel/py-cached-property@${PY_FLAVOR}
+.endif
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/h5py/*.so
 
@@ -39,4 +46,4 @@ post-install-EXAMPLES-on:
 do-test:
 	cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/science/py-h5py/distinfo b/science/py-h5py/distinfo
index c9cab68008b0..6dfa94d5c772 100644
--- a/science/py-h5py/distinfo
+++ b/science/py-h5py/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567842470
-SHA256 (h5py-2.10.0.tar.gz) = 84412798925dc870ffd7107f045d7659e60f5d46d1c70c700375248bf6bf512d
-SIZE (h5py-2.10.0.tar.gz) = 301057
+TIMESTAMP = 1611665487
+SHA256 (h5py-3.1.0.tar.gz) = 1e2516f190652beedcb8c7acfa1c6fa92d99b42331cbef5e5c7ec2d65b0fc3c2
+SIZE (h5py-3.1.0.tar.gz) = 371392
diff --git a/science/py-h5py/files/patch-setup.py b/science/py-h5py/files/patch-setup.py
new file mode 100644
index 000000000000..3a3544a35b81
--- /dev/null
+++ b/science/py-h5py/files/patch-setup.py
@@ -0,0 +1,23 @@
+--- setup.py.orig	2020-11-06 14:25:11 UTC
++++ setup.py
+@@ -27,10 +27,7 @@ VERSION = '3.1.0'
+ # Minimum supported versions of Numpy & Cython depend on the Python version
+ NUMPY_MIN_VERSIONS = [
+     # Numpy    Python
+-    ('1.12',   "=='3.6'"),
+-    ('1.14.5', "=='3.7'"),
+-    ('1.17.5', "=='3.8'"),
+-    ('1.19.3', ">='3.9'"),
++    ('1.14.5', ">='3.6'"),
+ ]
+ 
+ # these are required to use h5py
+@@ -49,7 +46,7 @@ SETUP_REQUIRES = [
+     f"Cython >=0.29; python_version<'3.8'",
+     f"Cython >=0.29.14; python_version>='3.8'",
+ ] + [
+-    f"numpy =={np_min}; python_version{py_condition}"
++    f"numpy >={np_min}; python_version{py_condition}"
+     for np_min, py_condition in NUMPY_MIN_VERSIONS
+ ]
+ 
diff --git a/science/py-h5py/pkg-descr b/science/py-h5py/pkg-descr
index 63263f5b4c2d..d8b9f5e206f6 100644
--- a/science/py-h5py/pkg-descr
+++ b/science/py-h5py/pkg-descr
@@ -8,5 +8,4 @@ data structures and their HDF5 equivalents vastly simplifies the process of
 reading and writing data from Python.
 
 WWW: https://www.h5py.org/
-WWW: https://pypi.org/project/h5py/
 WWW: https://github.com/h5py/h5py
diff --git a/science/py-h5py/pkg-plist b/science/py-h5py/pkg-plist
index f2c0c725145d..ef96ae587840 100644
--- a/science/py-h5py/pkg-plist
+++ b/science/py-h5py/pkg-plist
@@ -10,18 +10,20 @@
 %%PORTDOCS%%%%DOCSDIR%%/high/dims.rst
 %%PORTDOCS%%%%DOCSDIR%%/high/file.rst
 %%PORTDOCS%%%%DOCSDIR%%/high/group.rst
+%%PORTDOCS%%%%DOCSDIR%%/high/lowlevel.rst
 %%PORTDOCS%%%%DOCSDIR%%/index.rst
 %%PORTDOCS%%%%DOCSDIR%%/licenses.rst
 %%PORTDOCS%%%%DOCSDIR%%/mpi.rst
 %%PORTDOCS%%%%DOCSDIR%%/quick.rst
 %%PORTDOCS%%%%DOCSDIR%%/refs.rst
+%%PORTDOCS%%%%DOCSDIR%%/release_guide.rst
 %%PORTDOCS%%%%DOCSDIR%%/special.rst
 %%PORTDOCS%%%%DOCSDIR%%/strings.rst
 %%PORTDOCS%%%%DOCSDIR%%/swmr.rst
 %%PORTDOCS%%%%DOCSDIR%%/vds.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.0.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.1.rst
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.10.0.rst
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.10.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.2.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.3.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.4.rst
@@ -31,6 +33,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.7.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.8.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.9.rst
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew/3.0.rst
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew/3.1.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/index.rst
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bytesio.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/collective_io.py
@@ -38,8 +42,11 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dual_pco_edge.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eiger_use_case.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/excalibur_detector_modules.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multiblockslice_interleave.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multiprocessing_example.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/percival_use_case.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/store_and_retrieve_units_example.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/store_datetimes.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/swmr_inotify_example.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/swmr_multiprocess.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/threading_example.py