diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile
index d1d4e59fb306..0bd37464bdb2 100644
--- a/devel/py-tables/Makefile
+++ b/devel/py-tables/Makefile
@@ -1,52 +1,49 @@
 # Created by: ijliao@FreeBSD.org
 
 PORTNAME=	tables
-PORTVERSION=	3.6.1
-PORTREVISION=	1
+PORTVERSION=	3.7.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Hierarchical database for Python
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		liblzo2.so:archivers/lzo2 \
 		libucl.so:archivers/ucl
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0:devel/py-mock@${PY_FLAVOR}
 
 CONFLICTS_BUILD=	zstd # conflicting version of zstd is bundled
 
-USES=		fortran python:3.6+
+USES=		fortran localbase python:3.6+ localbase
 USE_PYTHON=	autoplist concurrent distutils cython
 
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		EXAMPLES
 OPTIONS_DEFINE_amd64=		AVX2
 
 AVX2_DESC=	Enable Haswell New Instructions (AVX2) support
 
 # Explicitly disable AVX2 otherwise it will be automatically enabled if the CPU
 # supports it.  If compiled in and run on hosts that have no AVX2 support, it
 # will trigger a SIGILL (Illegal instruction)
 # See also: https://github.com/PyTables/PyTables/issues/841
 AVX2_VARS_OFF=	MAKE_ENV+=DISABLE_AVX2=yes
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/setup.py
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables/*.so
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-tables/distinfo b/devel/py-tables/distinfo
index 5c36a473d0d5..0c2ff5f9641f 100644
--- a/devel/py-tables/distinfo
+++ b/devel/py-tables/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603187407
-SHA256 (tables-3.6.1.tar.gz) = 49a972b8a7c27a8a173aeb05f67acb45fe608b64cd8e9fa667c0962a60b71b49
-SIZE (tables-3.6.1.tar.gz) = 4641089
+TIMESTAMP = 1641524945
+SHA256 (tables-3.7.0.tar.gz) = e92a887ad6f2a983e564a69902de4a7645c30069fc01abd353ec5da255c5e1fe
+SIZE (tables-3.7.0.tar.gz) = 8227955
diff --git a/devel/py-tables/files/patch-setup.py b/devel/py-tables/files/patch-setup.py
deleted file mode 100644
index cb3166dc1121..000000000000
--- a/devel/py-tables/files/patch-setup.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- setup.py.orig	2019-03-19 12:02:31 UTC
-+++ setup.py
-@@ -124,8 +124,9 @@ if __name__ == '__main__':
-     debug = '--debug' in sys.argv
- 
-     # Global variables
--    lib_dirs = []
--    inc_dirs = [os.path.join('hdf5-blosc', 'src')]
-+    lib_dirs = ['%%LOCALBASE%%/lib']
-+    inc_dirs = [os.path.join('hdf5-blosc', 'src'),'%%LOCALBASE%%/include']
-+
-     optional_libs = []
-     data_files = []    # list of data files to add to packages (mainly for DLL's)
-