--- nfs-ganesha-3.0/src/CMakeLists.txt.orig	2019-11-13 14:52:54.092000000 +0000
+++ nfs-ganesha-3.0/src/CMakeLists.txt	2019-11-13 14:50:16.240000000 +0000
@@ -1005,6 +1005,7 @@
 
 set(NTIRPC_MIN_VERSION 3.0)
 if (USE_SYSTEM_NTIRPC)
+  set(NTIRPC_INCLUDE_DIR "/usr/include/ntirpc/")
   find_package(NTIRPC ${NTIRPC_MIN_VERSION} REQUIRED)
   if (USE_LTTNG)
     set(NTIRPC_LIBRARY ${NTIRPC_LIBRARY} ${NTIRPC_LTTNG})
--- nfs-ganesha-3.0/src/cmake/modules/FindNTIRPC.cmake.orig	2019-11-13 18:28:28.028000000 +0000
+++ nfs-ganesha-3.0/src/cmake/modules/FindNTIRPC.cmake	2019-11-13 18:30:26.280000000 +0000
@@ -46,15 +46,18 @@
 
 if (NOT NTIRPC_LIBRARY_DIR)
 	find_path(NTIRPC_LIBRARY_DIR
-    NAMES libntirpc.so
+    		NAMES libntirpc.so
 		PATHS ${NTIRPC_PREFIX}
-    PATH_SUFFIXES lib/${CMAKE_LIBRARY_ARCHITECTURE} lib lib64
+    		PATH_SUFFIXES lib/${CMAKE_LIBRARY_ARCHITECTURE} lib lib64
 		DOC "The NTIRPC libraries")
 endif (NOT NTIRPC_LIBRARY_DIR)
 
-find_library(NTIRPC_LIBRARY ntirpc PATHS ${NTIRPC_LIBRARY_DIR} NO_DEFAULT_PATH)
-find_library(NTIRPC_TRACEPOINTS ntirpc_tracepoints PATHS ${NTIRPC_LIBRARY_DIR} NO_DEFAULT_PATH)
-find_library(NTIRPC_LTTNG ntirpc_lttng PATHS ${NTIRPC_LIBRARY_DIR} NO_DEFAULT_PATH)
+find_library(NTIRPC_LIBRARY ntirpc
+		PATHS_SUFFIXES ${CMAKE_LIBRARY_ARCHITECTURE})
+find_library(NTIRPC_TRACEPOINTS ntirpc_tracepoints
+		PATHS_SUFFIXES ${CMAKE_LIBRARY_ARCHITECTURE})
+find_library(NTIRPC_LTTNG ntirpc_lttng
+		PATHS_SUFFIXES ${CMAKE_LIBRARY_ARCHITECTURE})
 
 set(NTIRPC_VERSION_HEADER "${NTIRPC_INCLUDE_DIR}/version.h")
 if (EXISTS ${NTIRPC_VERSION_HEADER})