diff --git a/projects/clr/hipamd/CMakeLists.txt b/projects/clr/hipamd/CMakeLists.txt
index a53ab0d2dc..14dba84e46 100755
--- a/projects/clr/hipamd/CMakeLists.txt
+++ b/projects/clr/hipamd/CMakeLists.txt
@@ -414,6 +414,18 @@ endif()
 install(FILES ${PROJECT_BINARY_DIR}/include/hip/hip_version.h
         DESTINATION include/hip)
 
+if (NOT ${HIPCC_BIN_DIR} STREQUAL "")
+  file(TO_CMAKE_PATH "${HIPCC_BIN_DIR}" HIPCC_BIN_DIR)
+  set(hipcc_bin ${HIPCC_BIN_DIR}/hipcc.bin)
+  set(hipconfig_bin ${HIPCC_BIN_DIR}/hipconfig.bin)
+  if(WIN32)
+    set(hipcc_bin ${hipcc_bin}.exe)
+    set(hipconfig_bin ${hipconfig_bin}.exe)
+  endif()
+  install(PROGRAMS ${hipcc_bin} DESTINATION bin)
+  install(PROGRAMS ${hipconfig_bin} DESTINATION bin)
+endif()
+
 #############################
 # hip-config
 #############################
diff --git a/projects/clr/hipamd/packaging/CMakeLists.txt b/projects/clr/hipamd/packaging/CMakeLists.txt
index d52d7d86ac..f325a9b4d5 100644
--- a/projects/clr/hipamd/packaging/CMakeLists.txt
+++ b/projects/clr/hipamd/packaging/CMakeLists.txt
@@ -78,11 +78,6 @@ else()
           PATTERN *.bat EXCLUDE)
 endif()
 
-if (NOT ${HIPCC_BIN_DIR} STREQUAL "")
-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bin DESTINATION bin)
-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bin DESTINATION bin)
-endif()
-
 install(DIRECTORY ${hip_SOURCE_DIR}/bin DESTINATION . COMPONENT dev
         USE_SOURCE_PERMISSIONS
         DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)