diff --git a/projects/rocr-runtime/CMakeLists.txt b/projects/rocr-runtime/CMakeLists.txt
index 7f0781b0c9..cb2605b725 100644
--- a/projects/rocr-runtime/CMakeLists.txt
+++ b/projects/rocr-runtime/CMakeLists.txt
@@ -39,6 +39,7 @@ endif ()
 
 ## Include common cmake modules
 include ( utils )
+include ( GNUInstallDirs )
 
 ## Setup the package version.
 get_version ( "1.0.0" )
@@ -137,7 +138,8 @@ add_custom_target ( package-dev DEPENDS build-dev
     WORKING_DIRECTORY ${DEV_BUILD_DIR} )
 
 ## Add the install directives for the runtime library.
-install ( TARGETS ${HSAKMT_TARGET} LIBRARY DESTINATION libhsakmt/lib COMPONENT ${HSAKMT_COMPONENT} )
+install ( TARGETS ${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION libhsakmt )
 
 ## Add the packaging directives for the runtime library.
 set ( CPACK_PACKAGE_NAME ${HSAKMT_PACKAGE} )
@@ -147,6 +149,7 @@ set ( CPACK_PACKAGE_VERSION_MINOR ${BUILD_VERSION_MINOR} )
 set ( CPACK_PACKAGE_VERSION_PATCH ${BUILD_VERSION_PATCH} )
 set ( CPACK_PACKAGE_CONTACT "Advanced Micro Devices Inc." )
 set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "HSAKMT library for AMD KFD support" )
+set ( CPACK_RESOURCE_FILE_LICENSE "${SOURCE_DIR}/LICENSE.md" )
 
 # Debian package specific variables
 set ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface" )
diff --git a/projects/rocr-runtime/DEBIAN/postinst b/projects/rocr-runtime/DEBIAN/postinst
index b6a16c013a..9510db5d1e 100755
--- a/projects/rocr-runtime/DEBIAN/postinst
+++ b/projects/rocr-runtime/DEBIAN/postinst
@@ -3,7 +3,7 @@
 set -e
 
 do_ldconfig() {
-    echo /opt/rocm/libhsakmt/lib > /etc/ld.so.conf.d/x86_64-libhsakmt.conf && ldconfig
+    echo /opt/rocm/lib > /etc/ld.so.conf.d/x86_64-libhsakmt.conf && ldconfig
 }
 
 case "$1" in
diff --git a/projects/rocr-runtime/DEBIAN/x86_64-libhsakmt.conf b/projects/rocr-runtime/DEBIAN/x86_64-libhsakmt.conf
index cfa6dc46b8..a4551d4820 100644
--- a/projects/rocr-runtime/DEBIAN/x86_64-libhsakmt.conf
+++ b/projects/rocr-runtime/DEBIAN/x86_64-libhsakmt.conf
@@ -1 +1 @@
-/opt/rocm/libhsakmt/lib
+/opt/rocm/lib
diff --git a/projects/rocr-runtime/RPM/rpm_post b/projects/rocr-runtime/RPM/rpm_post
index 7585d83dea..abd8ec2a6e 100644
--- a/projects/rocr-runtime/RPM/rpm_post
+++ b/projects/rocr-runtime/RPM/rpm_post
@@ -1 +1 @@
-echo /opt/rocm/libhsakmt/lib > /etc/ld.so.conf.d/x86_64-libhsakmt.conf && ldconfig
+echo /opt/rocm/lib > /etc/ld.so.conf.d/x86_64-libhsakmt.conf && ldconfig
diff --git a/projects/rocr-runtime/hsakmt-dev.txt b/projects/rocr-runtime/hsakmt-dev.txt
index 3fd4d9bbdb..79924fde39 100644
--- a/projects/rocr-runtime/hsakmt-dev.txt
+++ b/projects/rocr-runtime/hsakmt-dev.txt
@@ -29,6 +29,8 @@ set ( HSAKMT_DEV_PACKAGE "hsakmt-roct-dev" )
 
 project ( ${HSAKMT_DEV_PACKAGE} )
 
+include ( GNUInstallDirs )
+
 ## Set the runtime package name.
 set ( HSAKMT_PACKAGE @HSAKMT_PACKAGE@ )
 
@@ -40,18 +42,9 @@ set ( BUILD_VERSION_PATCH @BUILD_VERSION_PATCH@ )
 ## Verbose output.
 set ( CMAKE_VERBOSE_MAKEFILE on )
 
-## Create symlinks for packaging and install
-add_custom_target ( ${HSAKMT_DEV_PACKAGE} ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../libhsakmt/include/libhsakmt libhsakmt-link )
-add_custom_target ( ${HSAKMT_COMPONENT}.so-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../libhsakmt/lib/libhsakmt.so libhsakmt.so-link )
-
 ## Set the install targets
-install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION libhsakmt )
-install ( FILES ${SOURCE_DIR}/include/hsakmt.h DESTINATION libhsakmt/include/libhsakmt )
-install ( FILES ${SOURCE_DIR}/include/hsakmttypes.h DESTINATION libhsakmt/include/libhsakmt )
-install ( FILES ${SOURCE_DIR}/include/linux/kfd_ioctl.h DESTINATION libhsakmt/include/libhsakmt/linux )
-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/libhsakmt-link DESTINATION include RENAME libhsakmt )
-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/libhsakmt.so-link DESTINATION lib RENAME libhsakmt.so )
 install ( FILES libhsakmt.pc DESTINATION libhsakmt )
+install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} )
 
 
 ## Set the default generator types for the devel package.