diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fadcdad..e7b44570 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1479,6 +1479,11 @@ install(FILES ${HDR_COMPAT}
         DESTINATION "include"
         COMPONENT dev)
 
+# Install public headers
+install(FILES ${HDR_PUBLIC}
+        DESTINATION "include/event2"
+        COMPONENT dev)
+
 # Install the configs.
 install(FILES
         ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/LibeventConfig.cmake
diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake
index 352c86ba..52dc2be6 100644
--- a/cmake/AddEventLibrary.cmake
+++ b/cmake/AddEventLibrary.cmake
@@ -44,8 +44,6 @@ endmacro()
 # - EVENT_PACKAGE_RELEASE
 # - CMAKE_THREAD_LIBS_INIT LIB_PLATFORM
 # - OPENSSL_LIBRARIES
-# - HDR_PUBLIC
-# - EVENT_INSTALL_INCLUDE_DIR
 # - EVENT_SHARED_FLAGS
 # - EVENT_LIBRARY_STATIC
 # - EVENT_LIBRARY_SHARED
@@ -69,9 +67,6 @@ macro(add_event_library LIB_NAME)
         set_target_properties("${LIB_NAME}_static" PROPERTIES
             OUTPUT_NAME "${LIB_NAME}"
             CLEAN_DIRECT_OUTPUT 1)
-        set_target_properties(
-            "${LIB_NAME}_static" PROPERTIES
-            PUBLIC_HEADER "${HDR_PUBLIC}")
 
         list(APPEND LIBEVENT_STATIC_LIBRARIES "${LIB_NAME}_static")
         list(APPEND ADD_EVENT_LIBRARY_TARGETS "${LIB_NAME}_static")
@@ -113,11 +108,6 @@ macro(add_event_library LIB_NAME)
                 SOVERSION "${CURRENT_MINUS_AGE}")
         endif()
 
-        set_target_properties(
-            "${LIB_NAME}_shared" PROPERTIES
-            PUBLIC_HEADER "${HDR_PUBLIC}"
-            CLEAN_DIRECT_OUTPUT 1)
-
         if (NOT WIN32)
             set(LIB_LINK_NAME
                 "${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
@@ -146,7 +136,6 @@ macro(add_event_library LIB_NAME)
         LIBRARY DESTINATION "lib" COMPONENT lib
         ARCHIVE DESTINATION "lib" COMPONENT lib
         RUNTIME DESTINATION "lib" COMPONENT lib
-        PUBLIC_HEADER DESTINATION "include/event2"
         COMPONENT dev
     )
     if (NOT WIN32 AND ${EVENT_LIBRARY_SHARED})