diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt
index f0c6d7f91..95ea35930 100755
--- a/hipamd/CMakeLists.txt
+++ b/hipamd/CMakeLists.txt
@@ -429,7 +429,7 @@ configure_package_config_file(
       )
 
 configure_package_config_file(
-      hip-config-nvidia.cmake
+      hip-config-nvidia.cmake.in
       ${CMAKE_CURRENT_BINARY_DIR}/hip-config-nvidia.cmake
       INSTALL_DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR}
       PATH_VARS LIB_INSTALL_DIR INCLUDE_INSTALL_DIR BIN_INSTALL_DIR
diff --git a/hipamd/hip-config-nvidia.cmake b/hipamd/hip-config-nvidia.cmake.in
similarity index 77%
rename from hipamd/hip-config-nvidia.cmake
rename to hipamd/hip-config-nvidia.cmake.in
index fcc762015..cfc5ecd5e 100755
--- a/hipamd/hip-config-nvidia.cmake
+++ b/hipamd/hip-config-nvidia.cmake.in
@@ -18,6 +18,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-add_library(hip::device INTERFACE IMPORTED)
-add_library(hip::host INTERFACE IMPORTED)
-add_library(hip::amdhip64 INTERFACE IMPORTED)
+foreach(__lib device host amdhip64)
+    if (NOT TARGET hip::${__lib})
+        add_library(hip::${__lib} INTERFACE IMPORTED)
+        set_target_properties(hip::${__lib} PROPERTIES
+		INTERFACE_INCLUDE_DIRECTORIES @PACKAGE_INCLUDE_INSTALL_DIR@
+		INTERFACE_SYSTEM_INCLUDE_DIRECTORIES @PACKAGE_INCLUDE_INSTALL_DIR@)
+    endif()
+endforeach()