diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b6c24edd7..6a8743d24c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,10 +80,12 @@ set_property( TARGET ${CORE_TARGET} PROPERTY SOVERSION "${SO_MAJOR}" )
 if(ENABLE_ASAN_PACKAGING)
   # Only libraries required for ASAN Package
   set( CPACK_COMPONENTS_ALL asan )
-  set(COMP_TYPE "asan")
+  set( COMP_TYPE "asan" )
+  set( PKG_DESCRIPTION "Radeon Open Compute (ROCm) AddressSanitizer Instrumented Runtime software stack" )
 else()
   set( CPACK_COMPONENTS_ALL runtime )
-  set(COMP_TYPE "runtime")
+  set( COMP_TYPE "runtime" )
+  set( PKG_DESCRIPTION "Radeon Open Compute (ROCm) Runtime software stack" )
 endif()
 
 #intallation directive
@@ -95,6 +97,10 @@ install ( TARGETS ${CORE_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR}
 install ( FILES ${BUILD_DIR}/rocm_version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT runtime )
 install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/rocmmod DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime )
 
+# License file
+install(FILES ${COPYRIGHT_FILE} DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME LICENSE.txt COMPONENT runtime)
+install(FILES ${COPYRIGHT_FILE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-asan RENAME LICENSE.txt COMPONENT asan)
+
 ## Packaging directives
 set ( CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc." )
 set ( CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR} )
@@ -102,7 +108,7 @@ set ( CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR} )
 set ( CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH} )
 set ( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}" )
 set ( CPACK_PACKAGE_CONTACT "ROCm Dev Support <rocm-dev.support@amd.com>" )
-set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Radeon Open Compute (ROCm) Runtime software stack" )
+set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PKG_DESCRIPTION}" )
 set ( CPACK_RESOURCE_FILE_LICENSE "${COPYRIGHT_FILE}" )
 ## packaging variables
 if ( DEFINED ROCM_LIBPATCH_VERSION )
@@ -138,18 +144,16 @@ set ( CPACK_RPM_FILE_NAME "RPM-DEFAULT" )
 
 # Debian package specific variables
 set ( CPACK_DEBIAN_PACKAGE_DEPENDS ${DEB_DEPENDS_STRING} )
+set ( CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS ${CORE_TARGET} )
 set ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/RadeonOpenCompute/ROCm" )
-if(NOT ENABLE_ASAN_PACKAGING)
-  set ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${BUILD_DIR}/postinst;${BUILD_DIR}/prerm" )
-endif()
+set ( CPACK_DEBIAN_RUNTIME_PACKAGE_CONTROL_EXTRA "${BUILD_DIR}/postinst;${BUILD_DIR}/prerm" )
 
 ## RPM package specific variables
 set ( CPACK_RPM_PACKAGE_REQUIRES ${RPM_DEPENDS_STRING} )
+set ( CPACK_RPM_ASAN_PACKAGE_REQUIRES ${CORE_TARGET} )
 set ( CPACK_RPM_PACKAGE_LICENSE "MIT" )
-if(NOT ENABLE_ASAN_PACKAGING)
-  set ( CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/postinst" )
-  set ( CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/prerm" )
-endif()
+set ( CPACK_RPM_RUNTIME_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/postinst" )
+set ( CPACK_RPM_RUNTIME_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/prerm" )
 
 if ( DEFINED CPACK_PACKAGING_INSTALL_PREFIX )
     set ( CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/.info" )