diff --git a/science/py-h5py/Makefile b/science/py-h5py/Makefile
index 24026edf20cb..4885d08ec30a 100644
--- a/science/py-h5py/Makefile
+++ b/science/py-h5py/Makefile
@@ -1,48 +1,48 @@
 # Created by: TAOKA Fumiyoshi
 
 PORTNAME=	h5py
-PORTVERSION=	3.5.0
+PORTVERSION=	3.6.0
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	General-purpose Python interface to the HDF5 library
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/licenses/license.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython>=0.29.15:lang/cython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pkgconfig>=0,1:devel/py-pkgconfig@${PY_FLAVOR} \
 		${RUN_DEPENDS}
 LIB_DEPENDS=	libhdf5.so:science/hdf5
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.14.5,1:math/py-numpy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		localbase pkgconfig python:3.7+
 USE_PYTHON=	autoplist concurrent cython distutils
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30800
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cached-property>=0:devel/py-cached-property@${PY_FLAVOR}
 .endif
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR}
 
 do-test:
 	cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
 
 .include <bsd.port.post.mk>
diff --git a/science/py-h5py/distinfo b/science/py-h5py/distinfo
index 0ebb7492271b..8bd498327110 100644
--- a/science/py-h5py/distinfo
+++ b/science/py-h5py/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635181091
-SHA256 (h5py-3.5.0.tar.gz) = 77c7be4001ac7d3ed80477de5b6942501d782de1bbe4886597bdfec2a7ab821f
-SIZE (h5py-3.5.0.tar.gz) = 384643
+TIMESTAMP = 1637519900
+SHA256 (h5py-3.6.0.tar.gz) = 8752d2814a92aba4e2b2a5922d2782d0029102d99caaf3c201a566bc0b40db29
+SIZE (h5py-3.6.0.tar.gz) = 384160
diff --git a/science/py-h5py/files/patch-setup.py b/science/py-h5py/files/patch-setup.py
deleted file mode 100644
index e6b3709d1b00..000000000000
--- a/science/py-h5py/files/patch-setup.py
+++ /dev/null
@@ -1,22 +0,0 @@
---- setup.py.orig	2021-03-05 10:02:07 UTC
-+++ setup.py
-@@ -27,9 +27,7 @@ VERSION = '3.2.1'
- # Minimum supported versions of Numpy & Cython depend on the Python version
- NUMPY_MIN_VERSIONS = [
-     # Numpy    Python
--    ('1.14.5', "=='3.7'"),
--    ('1.17.5', "=='3.8'"),
--    ('1.19.3', ">='3.9'"),
-+    ('1.14.5', ">='3.7'"),
- ]
- 
- # these are required to use h5py
-@@ -49,7 +47,7 @@ SETUP_REQUIRES = [
-     "Cython >=0.29.14; python_version=='3.8'",
-     "Cython >=0.29.15; python_version>='3.9'",
- ] + [
--    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-plist b/science/py-h5py/pkg-plist
index f1d6928e2136..14c74301a120 100644
--- a/science/py-h5py/pkg-plist
+++ b/science/py-h5py/pkg-plist
@@ -1,59 +1,59 @@
 %%PORTDOCS%%%%DOCSDIR%%/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/README.rst
 %%PORTDOCS%%%%DOCSDIR%%/build.rst
 %%PORTDOCS%%%%DOCSDIR%%/conf.py
 %%PORTDOCS%%%%DOCSDIR%%/config.rst
 %%PORTDOCS%%%%DOCSDIR%%/contributing.rst
 %%PORTDOCS%%%%DOCSDIR%%/faq.rst
 %%PORTDOCS%%%%DOCSDIR%%/high/attr.rst
 %%PORTDOCS%%%%DOCSDIR%%/high/dataset.rst
 %%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%%/rever/rever.log
 %%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.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.2.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.3.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.4.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.5.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.6.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.7.1.rst
 %%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/3.2.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/3.3.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/3.4.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/3.5.rst
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew/3.6.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/index.rst
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bytesio.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/collective_io.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dataset_concatenation.py
 %%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
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vds_simple.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/write-direct-compressed.py