diff --git a/projects/clr/rocclr/cmake/FindNUMA.cmake b/projects/clr/rocclr/cmake/FindNUMA.cmake
new file mode 100644
index 0000000000..f16c06773b
--- /dev/null
+++ b/projects/clr/rocclr/cmake/FindNUMA.cmake
@@ -0,0 +1,29 @@
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+find_path(NUMA_INCLUDE_DIR numa.h)
+find_library(NUMA_LIBRARIES numa)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(NUMA
+  DEFAULT_MSG
+  NUMA_LIBRARIES NUMA_INCLUDE_DIR)
+
+mark_as_advanced(NUMA_LIBRARIES NUMA_INCLUDE_DIR)
diff --git a/projects/clr/rocclr/cmake/ROCclrHSA.cmake b/projects/clr/rocclr/cmake/ROCclrHSA.cmake
index fb127ed680..ffb3a6b396 100644
--- a/projects/clr/rocclr/cmake/ROCclrHSA.cmake
+++ b/projects/clr/rocclr/cmake/ROCclrHSA.cmake
@@ -27,10 +27,11 @@ find_package(hsa-runtime64 1.3 REQUIRED CONFIG
     lib64/cmake/hsa-runtime64)
 target_link_libraries(rocclr PUBLIC hsa-runtime64::hsa-runtime64)
 
-find_package(NUMA QUIET)
+find_package(NUMA)
 if(NUMA_FOUND)
   target_compile_definitions(rocclr PUBLIC ROCCLR_SUPPORT_NUMA_POLICY)
-  target_link_libraries(rocclr PUBLIC NUMA)
+  target_include_directories(rocclr PUBLIC ${NUMA_INCLUDE_DIR})
+  target_link_libraries(rocclr PUBLIC ${NUMA_LIBRARIES})
 endif()
 
 target_sources(rocclr PRIVATE