diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad82f67f2..423546618 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,12 +173,6 @@ endif()
 
 find_package(Threads REQUIRED)
 
-find_package(jsoncpp REQUIRED)
-if(TARGET jsoncpp_lib_static AND NOT TARGET jsoncpp_lib)
-    add_library(jsoncpp_lib INTERFACE)
-    target_link_libraries(jsoncpp_lib INTERFACE jsoncpp_lib_static)
-endif()
-
 include(CompilerFeatures)
 
 set(OPENCV_MODULES_USED)
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index b6bef2dff..cd0e37cc1 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -12,6 +12,7 @@ endif()
 
 # Build VRPN as subproject
 set(VRPN_GPL_SERVER FALSE CACHE INTERNAL "" FORCE)
+set(VRPN_USE_LOCAL_JSONCPP TRUE CACHE INTERNAL "" FORCE)
 if(BUILD_CLIENT AND NOT BUILD_SERVER)
     set(VRPN_BUILD_SERVER_LIBRARY FALSE CACHE INTERNAL "" FORCE)
     set(VRPN_BUILD_CLIENT_LIBRARY TRUE CACHE INTERNAL "" FORCE)
@@ -45,6 +46,13 @@ else()
     target_include_directories(vendored-hidapi INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/vrpn/submodules/hidapi")
 endif()
 
+# Set the include directories for the jsoncpp_lib target.
+if(VRPN_JSONCPP_SOURCE_ROOT)
+    target_include_directories(jsoncpp_lib INTERFACE "${VRPN_JSONCPP_SOURCE_ROOT}/include")
+else()
+    target_include_directories(jsoncpp_lib INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/vrpn/submodules/jsoncpp/include")
+endif()
+
 # Interface target for util headers
 add_library(util-headers INTERFACE)
 target_include_directories(util-headers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/util-headers")
diff --git a/vendor/vrpn b/vendor/vrpn
index 09f1b330b..c620c41aa 160000
--- a/vendor/vrpn
+++ b/vendor/vrpn
@@ -1 +1 @@
-Subproject commit 09f1b330becac85ca335dc1f1f6758a54e102e2f
+Subproject commit c620c41aa6d4c26ca7a172819720ec42ad645704