diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d147075c049db4f210a83496649f7c227ed1f95..f5325348bd3c70c96b480a3af277f30411a4762b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,6 +187,7 @@ target_include_directories(
   opus
   PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
          $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/opus>
   PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
           ${CMAKE_CURRENT_SOURCE_DIR}
           celt
diff --git a/OpusConfig.cmake.in b/OpusConfig.cmake.in
index 15771743af8315a5c0b48f98d220ef5fe7802665..0b21231d4f12a7b97e81c3be4f883fea68221185 100644
--- a/OpusConfig.cmake.in
+++ b/OpusConfig.cmake.in
@@ -7,7 +7,8 @@ set(OPUS_VERSION_PATCH @PROJECT_VERSION_PATCH@)
 @PACKAGE_INIT@
 
 set_and_check(OPUS_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
-set_and_check(OPUS_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
+set(OPUS_INCLUDE_DIR ${OPUS_INCLUDE_DIR};${OPUS_INCLUDE_DIR}/opus)
+set(OPUS_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@;@PACKAGE_INCLUDE_INSTALL_DIR@/opus")
 
 include(${CMAKE_CURRENT_LIST_DIR}/OpusTargets.cmake)