diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01089799f..bd89bf020 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1767,7 +1767,7 @@ endif()
 
 target_include_directories(wolfssl
     PUBLIC
-        $<INSTALL_INTERFACE:wolfssl>
+        $<INSTALL_INTERFACE:include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
@@ -2048,9 +2048,11 @@ set(INSTALLED_EXAMPLES
 
 # Install the library
 install(TARGETS wolfssl
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}
         EXPORT wolfssl-targets
-        LIBRARY)
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
+        RUNTIME DESTINATION bin
+        )
 # Install the headers
 install(DIRECTORY ${WOLFSSL_OUTPUT_BASE}/wolfssl/
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wolfssl