diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa4ad05..669adde 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,8 +60,8 @@ IF (NOT PAHO_BUILD_SHARED AND NOT PAHO_BUILD_STATIC)
     MESSAGE(FATAL_ERROR "You must set either PAHO_BUILD_SHARED, PAHO_BUILD_STATIC, or both")
 ENDIF()
 
-IF(PAHO_BUILD_DEB_PACKAGE)
-    set(CMAKE_INSTALL_DOCDIR share/doc/libpaho-mqtt)
+IF(1)
+    set(CMAKE_INSTALL_DOCDIR share/paho-mqtt)
     set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON)
     set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY ">=")
 ENDIF()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0bc7194..db4a0ac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -183,7 +183,7 @@ IF (PAHO_BUILD_STATIC)
 ENDIF()
 
 INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h MQTTProperties.h MQTTReasonCodes.h MQTTSubscribeOpts.h MQTTExportDeclarations.h
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/paho-mqtt)
 
 IF (PAHO_WITH_SSL)
     SET(OPENSSL_ROOT_DIR "" CACHE PATH "Directory containing OpenSSL libraries and includes")