--- a/main/trunk/CMakeLists.txt
+++ b/main/trunk/CMakeLists.txt
@@ -410,7 +410,8 @@
             ${build_lib_dir})
 # Extra link library definitions
 target_link_libraries(rexxapi ${platform_rexxapi_libs})
-install(TARGETS rexxapi LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT Core
+install(TARGETS rexxapi RUNTIME DESTINATION ${INSTALL_LIB_DIR} COMPONENT Core
+                        LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT Core
                         ARCHIVE DESTINATION ${INSTALL_INCLUDE_DIR} COMPONENT DevLib)
 set_target_properties(rexxapi PROPERTIES VERSION ${ORX_VERSION})
 
@@ -649,7 +650,8 @@
 
 # Extra link library definitions
 target_link_libraries(rexx rexxapi ${platform_interpreter_libs})
-install(TARGETS rexx LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT Core
+install(TARGETS rexx RUNTIME DESTINATION ${INSTALL_LIB_DIR} COMPONENT Core
+                     LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT Core
                      ARCHIVE DESTINATION ${INSTALL_INCLUDE_DIR} COMPONENT DevLib)
 set_target_properties(rexx PROPERTIES VERSION ${ORX_VERSION})
 
@@ -683,7 +685,8 @@
    COMMENT "Adding custom manifest to rexx.exe...")
 endif ()
 
-install(TARGETS rexx_exe RUNTIME COMPONENT Core DESTINATION ${INSTALL_EXECUTABLE_DIR})
+install(TARGETS rexx_exe RUNTIME COMPONENT Core DESTINATION ${INSTALL_EXECUTABLE_DIR}
+                         LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT Core)
 
 #################### rexximage (bin file) ##########################
 # These are the core classes built into the .img file.
@@ -883,7 +886,8 @@
              ${build_messages_dir})
 # Extra link library definitions
 target_link_libraries(rexxutil rexx rexxapi ${platform_rexxutil_libs})
-install(TARGETS rexxutil LIBRARY COMPONENT Core DESTINATION ${INSTALL_LIB_DIR} ARCHIVE DESTINATION ${INSTALL_INCLUDE_DIR})
+install(TARGETS rexxutil RUNTIME COMPONENT Core DESTINATION ${INSTALL_LIB_DIR}
+                         LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT Core)
 set_target_properties(rexxutil PROPERTIES VERSION ${ORX_VERSION})
 
 #################### librxmath.so ################
@@ -904,7 +908,8 @@
              ${build_api_platform_dir})
 # Extra link library definitions
 target_link_libraries(rxmath rexx rexxapi ${platform_rxmath_libs})
-install(TARGETS rxmath LIBRARY COMPONENT Core DESTINATION ${INSTALL_LIB_DIR} ARCHIVE DESTINATION ${INSTALL_INCLUDE_DIR})
+install(TARGETS rxmath RUNTIME COMPONENT Core DESTINATION ${INSTALL_LIB_DIR}
+                       LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT Core)
 set_target_properties(rxmath PROPERTIES VERSION ${ORX_VERSION})
 
 #################### librxsock.so ################
@@ -921,7 +926,8 @@
              ${platform_rxsock_sources})
 # Extra link library definitions
 target_link_libraries(rxsock rexx rexxapi ${platform_rxsock_libs})
-install(TARGETS rxsock LIBRARY COMPONENT Core DESTINATION ${INSTALL_LIB_DIR} ARCHIVE DESTINATION ${INSTALL_INCLUDE_DIR})
+install(TARGETS rxsock RUNTIME COMPONENT Core DESTINATION ${INSTALL_LIB_DIR}
+                       LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT Core)
 set_target_properties(rxsock PROPERTIES VERSION ${ORX_VERSION})
 
 #################### librxregexp.so ################
@@ -945,7 +951,8 @@
              ${build_messages_dir})
 # Extra link library definitions
 target_link_libraries(rxregexp rexx rexxapi ${platform_rxregexp_libs})
-install(TARGETS rxregexp LIBRARY COMPONENT Core DESTINATION ${INSTALL_LIB_DIR} ARCHIVE DESTINATION ${INSTALL_INCLUDE_DIR})
+install(TARGETS rxregexp RUNTIME COMPONENT Core DESTINATION ${INSTALL_LIB_DIR}
+                         LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT Core)
 set_target_properties(rxregexp PROPERTIES VERSION ${ORX_VERSION})
 
 #################### libhostemu.so ################
@@ -969,7 +976,8 @@
              ${build_extensions_hostemu_dir})
 # Extra link library definitions
 target_link_libraries(hostemu rexx rexxapi ${platform_hostemu_libs})
-install(TARGETS hostemu LIBRARY COMPONENT Core DESTINATION ${INSTALL_LIB_DIR} ARCHIVE DESTINATION ${INSTALL_INCLUDE_DIR})
+install(TARGETS hostemu RUNTIME COMPONENT Core DESTINATION ${INSTALL_LIB_DIR}
+                        LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT Core)
 set_target_properties(hostemu PROPERTIES VERSION ${ORX_VERSION})
 
 #################### librxunixsys.so ################
@@ -984,7 +992,8 @@
 # Extra link library definitions
 target_link_libraries(rxunixsys rexx rexxapi)
 set_target_properties(rxunixsys PROPERTIES VERSION ${ORX_VERSION})
-install(TARGETS rxunixsys LIBRARY DESTINATION ${INSTALL_LIB_DIR} ARCHIVE DESTINATION ${INSTALL_INCLUDE_DIR})
+install(TARGETS rxunixsys RUNTIME DESTINATION ${INSTALL_LIB_DIR}
+                          LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT Core)
 endif ()
 
 #################### orexxole.dll ################
@@ -1000,7 +1009,7 @@
              ${build_extensions_ole_dir})
 # Extra link library definitions
 target_link_libraries(orexxole rexx rexxapi)
-install(TARGETS orexxole LIBRARY COMPONENT Core DESTINATION ${INSTALL_LIB_DIR} ARCHIVE DESTINATION ${INSTALL_INCLUDE_DIR})
+install(TARGETS orexxole RUNTIME COMPONENT Core DESTINATION ${INSTALL_LIB_DIR})
 endif ()
 
 #################### rxwinsys.dll ################
@@ -1015,7 +1024,7 @@
              ${build_extensions_rxwinsys_dir})
 # Extra link library definitions
 target_link_libraries(rxwinsys rexx rexxapi shlwapi)
-install(TARGETS rxwinsys LIBRARY COMPONENT Core DESTINATION ${INSTALL_LIB_DIR} ARCHIVE DESTINATION ${INSTALL_INCLUDE_DIR})
+install(TARGETS rxwinsys RUNTIME COMPONENT Core DESTINATION ${INSTALL_LIB_DIR})
 endif ()
 
 #################### oodialog.dll ################
@@ -1074,7 +1083,7 @@
              ${build_extensions_oodialog_dir})
 # Extra link library definitions
 target_link_libraries(oodialog rexx rexxapi winmm comdlg32 comctl32 shlwapi oleacc uxtheme rpcrt4 propsys delayimp)
-install(TARGETS oodialog LIBRARY COMPONENT Core DESTINATION ${INSTALL_LIB_DIR} ARCHIVE DESTINATION ${INSTALL_INCLUDE_DIR})
+install(TARGETS oodialog RUNTIME COMPONENT Core DESTINATION ${INSTALL_LIB_DIR})
 
 #################### ooDialog.exe (executable) ##########################
 # Sources for ooDialog.exe