diff --git a/projects/hip/CMakeLists.txt b/projects/hip/CMakeLists.txt
index 85e6ff1c21..88b14b0521 100644
--- a/projects/hip/CMakeLists.txt
+++ b/projects/hip/CMakeLists.txt
@@ -36,8 +36,6 @@ if(HIP_PLATFORM STREQUAL "hcc")
             set(HCC_HOME $ENV{HCC_HOME} CACHE PATH "Path to which HCC has been installed")
         endif()
     endif()
-    message(STATUS ${HCC_HOME})
-    file(WRITE "./bin/.hip-config" ${HCC_HOME})
     if(IS_ABSOLUTE ${HCC_HOME} AND EXISTS ${HCC_HOME} AND IS_DIRECTORY ${HCC_HOME})
         execute_process(COMMAND ${HCC_HOME}/bin/hcc --version
                         COMMAND cut -d\  -f9
@@ -151,6 +149,10 @@ if(HIP_PLATFORM STREQUAL "hcc")
         #add_library(hip_hcc STATIC ${SOURCE_FILES})
         add_library(hip_hcc OBJECT ${SOURCE_FILES})
     endif()
+
+    # Generate .hipconfig
+    string(TIMESTAMP _timestamp)
+    file(WRITE "${PROJECT_BINARY_DIR}/.hipconfig" "# Auto-generated by cmake on ${_timestamp} local time\nHCC_HOME=${HCC_HOME}\nHCC_VERSION=${HCC_VERSION}\n")
 endif()
 
 # Build doxygen documentation
@@ -168,6 +170,9 @@ if(HIP_PLATFORM STREQUAL "hcc")
         #install(TARGETS hip_hcc DESTINATION lib)
         install(DIRECTORY ${PROJECT_BINARY_DIR}/CMakeFiles/hip_hcc.dir/src/ DESTINATION lib)
     endif()
+
+    # Install .hipconfig
+    install(FILES ${PROJECT_BINARY_DIR}/.hipconfig DESTINATION bin)
 endif()
 
 # Install src, bin, include if necessary