diff --git a/misc/openvdb/Makefile b/misc/openvdb/Makefile
index 13c27aff0668..9fcaa1d46052 100644
--- a/misc/openvdb/Makefile
+++ b/misc/openvdb/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	openvdb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.1.0
+PORTREVISION=	1
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -23,8 +24,8 @@ USE_LDCONFIG=	yes
 
 CMAKE_OFF=	OPENVDB_CORE_STATIC
 
-OPTIONS_DEFINE=		PYTHON
-OPTIONS_DEFAULT=	PYTHON
+OPTIONS_DEFINE=		PYTHON TOOLS DOCS # TOOLS should be a subpackage
+OPTIONS_DEFAULT=	PYTHON TOOLS
 OPTIONS_SUB=		yes
 
 PYTHON_USES=		python:2.7 # 3.6 is broken: https://github.com/AcademySoftwareFoundation/openvdb/issues/427
@@ -34,4 +35,17 @@ PYTHON_LIB_DEPENDS=	${PY_BOOST}
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
 
+TOOLS_DESC=		Build CLI tools
+TOOLS_CMAKE_BOOL=	OPENVDB_BUILD_BINARIES OPENVDB_BUILD_VDB_LOD \
+			OPENVDB_BUILD_VDB_RENDER OPENVDB_BUILD_VDB_VIEW
+TOOLS_LIB_DEPENDS=	libglfw.so:graphics/glfw \
+			libIlmImf.so:graphics/openexr
+TOOLS_USES=		gl
+TOOLS_USE=		GL=gl,glu XORG=x11,xcursor,xi,xinerama,xrandr,xxf86vm
+
+DOCS_CMAKE_BOOL=	OPENVDB_BUILD_DOCS
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
+
+PORTDOCS=	*
+
 .include <bsd.port.mk>
diff --git a/misc/openvdb/files/patch-CMakeLists.txt b/misc/openvdb/files/patch-CMakeLists.txt
index f0681abbc060..b153fc11ed0c 100644
--- a/misc/openvdb/files/patch-CMakeLists.txt
+++ b/misc/openvdb/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2019-05-11 05:39:52 UTC
+--- CMakeLists.txt.orig	2019-05-07 20:58:35 UTC
 +++ CMakeLists.txt
-@@ -177,7 +177,7 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS
+@@ -177,7 +177,7 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS)
    set(MINIMUM_ZLIB_VERSION 1.2.7)
    set(MINIMUM_TBB_VERSION 4.4)
  
@@ -9,3 +9,12 @@
    set(MINIMUM_NUMPY_VERSION 1.9.2)
  
    set(MINIMUM_CPPUNIT_VERSION 1.10)
+@@ -271,7 +271,7 @@ if(OPENVDB_BUILD_DOCS)
+     COMMENT "Generating API documentation with Doxygen" VERBATIM
+   )
+ 
+-  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION docs)
++  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION share/doc/openvdb)
+ endif()
+ 
+ # Early exit if there's nothing to build
diff --git a/misc/openvdb/pkg-plist b/misc/openvdb/pkg-plist
index 12cfe442bd85..e2972a0616e5 100644
--- a/misc/openvdb/pkg-plist
+++ b/misc/openvdb/pkg-plist
@@ -1,4 +1,7 @@
 bin/vdb_print
+%%TOOLS%%bin/vdb_lod
+%%TOOLS%%bin/vdb_render
+%%TOOLS%%bin/vdb_view
 include/openvdb/Exceptions.h
 include/openvdb/Grid.h
 include/openvdb/MetaMap.h