diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile
index 84eddd8f7f18..aba0fd4af874 100644
--- a/devel/py-tables/Makefile
+++ b/devel/py-tables/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tables
 PORTVERSION=	3.9.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,16 +15,15 @@ BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}py-cpuinfo>=0:sysutils/py-py-cpuinfo@${PY_FLAVOR}
-LIB_DEPENDS=	libhdf5.so:science/hdf5 \
+LIB_DEPENDS=	libblosc.so:archivers/c-blosc \
+		libblosc2.so:archivers/c-blosc2 \
+		libhdf5.so:science/hdf5 \
 		liblzo2.so:archivers/lzo2 \
-		libucl.so:archivers/ucl \
-		libblosc2.so:archivers/c-blosc2
+		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 localbase python
 USE_PYTHON=	autoplist concurrent distutils cython
 
@@ -40,6 +40,10 @@ AVX2_DESC=	Enable Haswell New Instructions (AVX2) support
 # See also: https://github.com/PyTables/PyTables/issues/841
 AVX2_VARS_OFF=	MAKE_ENV+=DISABLE_AVX2=yes
 
+post-patch:
+# Clean up bundled libraries
+	@${RM} -r ${WRKSRC}/c-blosc/
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables/*.so