diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ad72df..eb86722 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ set(libsigmf_deps "")
 
 # flatbuffers
 if (${USE_SYSTEM_FLATBUFFERS})
-  find_package(Flatbuffers REQUIRED)
+  find_package(FlatBuffers REQUIRED NAMES FlatBuffers Flatbuffers)
 endif (${USE_SYSTEM_FLATBUFFERS})
 
 if (NOT ${USE_SYSTEM_FLATBUFFERS})
@@ -146,7 +146,7 @@ set(LIBSIGMF_PREGEN_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/sigmf_protocols")
 ########################################################################
 add_library(libsigmf INTERFACE)
 target_include_directories(libsigmf INTERFACE
-  $<INSTALL_INTERFACE:include>
+  $<INSTALL_INTERFACE:include/sigmf>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
   $<INSTALL_INTERFACE:include/sigmf/fbs>
   $<BUILD_INTERFACE:${LIBSIGMF_PREGEN_HEADERS}>
diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in
index 852eb2b..68fb8e0 100644
--- a/cmake/config.cmake.in
+++ b/cmake/config.cmake.in
@@ -13,6 +13,6 @@ if(NOT TARGET @PROJECT_NAME@::@LIBSIGMF_TARGET_NAME@)
   include(CMakeFindDependencyMacro)
 
   find_dependency(nlohmann_json REQUIRED)
-  find_dependency(Flatbuffers REQUIRED)
+  find_dependency(FlatBuffers REQUIRED NAMES FlatBuffers Flatbuffers)
   include("${CMAKE_CURRENT_LIST_DIR}/@LIBSIGMF_TARGETS_EXPORT_NAME@.cmake")
 endif()