diff --git a/CMake/Findjsoncpp.cmake b/CMake/Findjsoncpp.cmake
index 416c1061d901e792f2a2b814c9d384526136cd07..370e2e3ca990b5c6c83e49b68aa4627b756f8d3f 100644
--- a/CMake/Findjsoncpp.cmake
+++ b/CMake/Findjsoncpp.cmake
@@ -4,11 +4,11 @@
 #
 # This module defines the following variables:
 #  JSONCPP_FOUND - True if libjsoncpp has been found.
-#  JSONCPP_INCLUDE_DIRS - location to look for headers,
+#  JSONCPP_INCLUDE_DIR - location to look for headers,
 #  JSONCPP_LIBRARIES - the libraries to link against libjsoncpp
 
 find_path(JSONCPP_INCLUDE_DIR json/features.h
-    PATH_SUFFIXES include jsoncpp)
+    PATH_SUFFIXES include jsoncpp include/jsoncpp)
 find_library(JSONCPP_LIBRARY jsoncpp)
 
 include(FindPackageHandleStandardArgs)
@@ -21,6 +21,6 @@ endif(NOT JSONCPP_FOUND)
 
 set(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
 mark_as_advanced(
-    JSONCPP_INCLUDE_DIRS
+    JSONCPP_INCLUDE_DIR
     JSONCPP_LIBRARIES
 )
diff --git a/CMake/generate.conf b/CMake/generate.conf
index a45d50ea6919ad68f4b95e0a123548f6c71d437e..f6582191cb6ae64d617e6233a599caf3c2c378a9 100644
--- a/CMake/generate.conf
+++ b/CMake/generate.conf
@@ -56,7 +56,7 @@ find: Graphviz
 
 [CMake:Deps:json]
 link: ${JSONCPP_LIBRARIES}
-include: ${jsoncpp_INCLUDE_DIRS}
+include: ${JSONCPP_INCLUDE_DIR}
 find: jsoncpp REQUIRED
 
 [CMake:Deps:readline]