diff --git a/projects/rocminfo/CMakeLists.txt b/projects/rocminfo/CMakeLists.txt
index ddec0d2cf1..b5fa9dd0de 100755
--- a/projects/rocminfo/CMakeLists.txt
+++ b/projects/rocminfo/CMakeLists.txt
@@ -1,41 +1,136 @@
+#
+# Minimum version of cmake required
+#
 cmake_minimum_required(VERSION 2.8.0)
+#
+# GCC 4.8 or higher compiler required.
+#
+#   Required Defines on cmake command line
+#
+#   1) Set location of ROCR header files (required)
+#
+#      ROCM_DIR="Root for RocM install"
+#
+#   2) Set ROCRTST_BLD_TYPE to either "Debug" or "Release".
+#      If not set, the default value is "Debug" is bound.
+#
+#      ROCRTST_BLD_TYPE=Debug or ROCRTST_BLD_TYPE=Release
+#
+#   3) Set ROCRTST_BLD_BITS to either "32" or "64"
+#      If not set, the default value of "64" is bound.
+#
+#       ROCRTST_BLD_BITS=32 or ROCRTST_BLD_BITS=64
+#
+#   Building rocminfo
+#
+#   1) Create build folder e.g. "rocminfo/build" - any name will do
+#   2) Cd into build folder
+#   3) Run cmake, passing in the above defines, as needed/required:
+#       "cmake -DROCM_DIR=<path to rocm root> <other defines if needed> .."
+#   4) Run "make"
+#
+#   Upon a successful build, the executable "rocminfo" will be in the
+#   build directory.
+#
+# Currently support for Windows platform is not present
+#
+if(WIN32)
+  message("This sample is not supported on Windows platform")
+  return()
+endif()
+#
+# Process input variables
+#
 
-# Default installation path
-set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE PATH "")
+# Required Defines first:
+
+set(ROCR_INC_DIR ${ROCM_DIR}/include)
+set(ROCR_LIB_DIR ${ROCM_DIR}/lib)
+#
+# Determine ROCR Header files are present
+#
+if(NOT EXISTS ${ROCR_INC_DIR}/hsa/hsa.h)
+  message("ERROR: ${ROCR_INC_DIR}/hsa/hsa.h does not exist. Check value of ROCM_DIR define")
+  return()
+endif()
+
+# Determine ROCR Library files are present
+#
+if("${ROCRTST_BLD_BITS}" STREQUAL 32)
+  set (ONLY64STR "")
+  set (IS64BIT 0)
+else()
+  set (ONLY64STR "64")
+  set (IS64BIT 1)
+endif()
+#
+if (${IS64BIT} EQUAL 0)
+  if(NOT EXISTS ${ROCR_LIB_DIR}/libhsa-runtime.so)
+    message("ERROR: ${ROCR_LIB_DIR}/libhsa-runtime.so doesn't exist. Check value of ROCM_DIR define")
+    return()
+  endif()
+else()
+  if(NOT EXISTS ${ROCR_LIB_DIR}/libhsa-runtime64.so)
+    message("ERROR: Define ROCR_LIB_DIR pointing to ROCR libraries is not set")
+    return()
+  endif()
+endif()
+
+string(TOLOWER "${ROCRTST_BLD_TYPE}" tmp)
+if("${tmp}" STREQUAL release)
+  set(BUILD_TYPE "Release")
+  set(ISDEBUG 0)
+else()
+  set(BUILD_TYPE "Debug")
+  set(ISDEBUG 1)
+endif()
+
+# Set Name for Samples Project
+#
 
 set(ROCMINFO_EXE "rocminfo")
 set(PROJECT_NAME ${ROCMINFO_EXE})
 project (${PROJECT_NAME})
 
-find_package(ROCM PATHS /opt/rocm)
-include(ROCMSetupVersion)
-include(ROCMCreatePackage)
+#
+# Print out the build configuration being used:
+#
+#   Build Src directory
+#   Build Binary directory
+#   Build Type: Debug Vs Release, 32 Vs 64
+#   Compiler Version, etc
+#
+message("")
+message("Build Configuration:")
+message("-------------IS64BIT: " ${IS64BIT})
+message("-----------BuildType: " ${BUILD_TYPE})
+message("------------Compiler: " ${CMAKE_CXX_COMPILER})
+message("-------------Version: " ${CMAKE_CXX_COMPILER_VERSION})
+message("--------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
+message("--------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
+message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
+message("--------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
+message("")
 
-rocm_setup_version(VERSION 1.0.0)
-
-find_path(ROCR_INC_DIR hsa/hsa.h PATH_SUFFIXES include PATHS /opt/rocm)
-if(NOT ROCR_INC_DIR)
-    message(FATAL_ERROR "Can't find hsa.h.")
-endif()
-
-find_path(ROCR_LIB_DIR libhsa-runtime64.so PATH_SUFFIXES lib PATHS /opt/rocm)
-if(NOT ROCR_LIB_DIR)
-    message(FATAL_ERROR "Can't find libhsa-runtime64.so.")
-endif()
 
+#
+# Set the build type based on user input
+#
+set(CMAKE_BUILD_TYPE ${BUILD_TYPE})
 #
 # Flag to enable / disable verbose output.
 #
 SET( CMAKE_VERBOSE_MAKEFILE on )
-
 #
 # Compiler pre-processor definitions.
 #
+# Define MACRO "DEBUG" if build type is "Debug"
+if(${BUILD_TYPE} STREQUAL "Debug")
+add_definitions(-DDEBUG)
+endif()
+
 add_definitions(-D__linux__)
 add_definitions(-DLITTLEENDIAN_CPU=1)
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    add_definitions(-DDEBUG)
-endif ()
 
 #
 # Linux Compiler options
@@ -50,12 +145,22 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmerge-all-constants")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fms-extensions")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -O0")
-endif ()
+
+#
+# Extend the compiler flags for 64-bit builds
+#
+if (IS64BIT)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64  -msse -msse2")
+else()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+endif()
+
+#
+# Add compiler flags to include symbol information for debug builds
+#
+if(ISDEBUG)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -O0")
+endif()
 
 #
 # Linux Linker options
@@ -68,13 +173,14 @@ link_directories(${ROCR_LIB_DIR})
 #
 # Extend the list of libraries to be used for linking ROC Perf Apps
 #
-set(ROCR_LIBS ${ROCR_LIBS} hsa-runtime64)
+set(ROCR_LIBS ${ROCR_LIBS} hsa-runtime${ONLY64STR})
 
-include_directories(${ROCR_INC_DIR})
+include_directories(${ROCR_INC_DIR} ${OPENCL_INC_DIR})
 
 ###########################
 # rocm_agent_enumerator
 ###########################
+
 configure_file(rocm_agent_enumerator rocm_agent_enumerator COPYONLY)
 
 
@@ -100,8 +206,31 @@ install (
 ###########################
 # Packaging directives
 ###########################
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "hsa-rocr-dev, python")
-set(CPACK_RPM_PACKAGE_REQUIRES "hsa-rocr-dev, python")
+set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
+
+if (NOT DEFINED CPACK_PACKAGE_VENDOR)
+    set(CPACK_PACKAGE_VENDOR "AMD")
+endif ()
+
+if (NOT DEFINED CPACK_PACKAGE_VERSION_MAJOR)
+    set(CPACK_PACKAGE_VERSION_MAJOR "1")
+endif ()
+
+if (NOT DEFINED CPACK_PACKAGE_VERSION_MINOR)
+    set(CPACK_PACKAGE_VERSION_MINOR "0")
+endif ()
+
+if (NOT DEFINED CPACK_PACKAGE_VERSION_PATCH)
+    set(CPACK_PACKAGE_VERSION_PATCH "0")
+endif ()
+
+if (NOT DEFINED CPACK_PACKAGE_CONTACT)
+    set(CPACK_PACKAGE_CONTACT "Advanced Micro Devices Inc.")
+endif ()
+
+if (NOT DEFINED CPACK_PACKAGE_DESCRIPTION_SUMMARY)
+    set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Radeon Open Compute (ROCm) Runtime rocminfo tool")
+endif ()
 
 ###########################
 # Debian package specific variables
@@ -111,12 +240,11 @@ set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_DEBIAN_PACKAGE_HOMEPAGE} CACHE STRING
 ###########################
 # RPM package specific variables
 ###########################
-if (DEFINED CPACK_PACKAGING_INSTALL_PREFIX)
-    set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/bin")
-endif( )
+if ( DEFINED CPACK_PACKAGING_INSTALL_PREFIX )
+    set ( CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/bin" )
+endif ( )
 
-rocm_create_package(
-    NAME rocminfo
-    DESCRIPTION "Radeon Open Compute (ROCm) Runtime rocminfo tool"
-    MAINTAINER "Advanced Micro Devices Inc."
-)
+###########################
+# Include packaging
+###########################
+include ( CPack )