--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -578,11 +578,11 @@ endif(USE_GSS)
 
 gopt_test(USE_ADMIN_TOOLS)
 if (USE_ADMIN_TOOLS)
-  find_package (Python COMPONENTS Interpreter Development)
-  if (NOT Python_Interpreter_FOUND)
+  find_package(PythonInterp ${USE_ADMIN_TOOLS_REQUIRED})
+  if (NOT PYTHONINTERP_FOUND)
     message(WARNING "Cannot find python. Disablin admin tools")
     set(USE_ADMIN_TOOLS OFF)
-  endif (NOT Python_Interpreter_FOUND)
+  endif (NOT PYTHONINTERP_FOUND)
 endif (USE_ADMIN_TOOLS)
 
 gopt_test(USE_GUI_ADMIN_TOOLS)
@@ -1184,6 +1184,7 @@ endif(USE_9P_RDMA)
 
 set(NTIRPC_MIN_VERSION 4.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})
--- a/src/cmake/modules/FindNTIRPC.cmake
+++ b/src/cmake/modules/FindNTIRPC.cmake
@@ -67,15 +67,18 @@ endif (NOT NTIRPC_INCLUDE_DIR)
 
 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})
--- a/src/scripts/ganeshactl/CMakeLists.txt
+++ b/src/scripts/ganeshactl/CMakeLists.txt
@@ -65,7 +65,7 @@ set(UI_SRC
   Ganesha/QtUI/ui_log_dialog.ui
   )
 
-if(Python_FOUND)
+if(PYTHONINTERP_FOUND)
   set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
   set(SETUP_PY    "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
   set(OUTPUT      "${CMAKE_CURRENT_BINARY_DIR}/build/ganeshactl_timestamp")
@@ -139,7 +139,7 @@ if(Python_FOUND)
 
   add_custom_command(
     OUTPUT ${OUTPUT}
-    COMMAND ${Python_EXECUTABLE} "${SETUP_PY}"  build
+    COMMAND ${PYTHON_EXECUTABLE} "${SETUP_PY}"  build
     COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
     DEPENDS ${GANESHA_SRCS} ${UI_PY_FILES} ${SCRIPTS}
     )
@@ -148,9 +148,9 @@ if(Python_FOUND)
 
   install(
     CODE
-    "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${Python_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
+    "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND env COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --install-layout=deb --root=\$ENV{DESTDIR})"
     )
-endif(Python_FOUND)
+endif(PYTHONINTERP_FOUND)
 
 # Man page
 set(man8_file ganesha_conf.man)
--- a/src/scripts/gpfs-epoch/CMakeLists.txt
+++ b/src/scripts/gpfs-epoch/CMakeLists.txt
@@ -21,7 +21,7 @@
 #-------------------------------------------------------------------------------
 
 if(USE_FSAL_GPFS)
-  if(Python_FOUND)
+  if(PYTHONINTERP_FOUND)
     set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
     set(SETUP_PY    "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
     set(OUTPUT      "${CMAKE_CURRENT_BINARY_DIR}/build/gpfs_epoch_timestamp")
@@ -59,7 +59,7 @@ if(USE_FSAL_GPFS)
     add_custom_command(
       OUTPUT ${OUTPUT}
       COMMAND ${CMAKE_COMMAND} -E touch __init__.py
-      COMMAND ${Python_EXECUTABLE} "${SETUP_PY}"  build
+      COMMAND ${PYTHON_EXECUTABLE} "${SETUP_PY}"  build
       COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
       DEPENDS ${GPFS_EPOCH_SRCS} ${SCRIPTS}
       )
@@ -68,7 +68,7 @@ if(USE_FSAL_GPFS)
 
     install(
       CODE
-      "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${Python_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} --install-scripts=\$ENV{DESTDIR}${LIBEXECDIR}/ganesha)"
+      "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND env COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --install-layout=deb --root=\$ENV{DESTDIR} --install-scripts=./${LIBEXECDIR}/ganesha)"
       )
-  endif(Python_FOUND)
+  endif(PYTHONINTERP_FOUND)
 endif(USE_FSAL_GPFS)