diff --git a/Installation/cmake/modules/CGAL_UseRS3.cmake b/Installation/cmake/modules/CGAL_UseRS3.cmake
index db6e1001809..350ad2adb37 100644
--- a/Installation/cmake/modules/CGAL_UseRS3.cmake
+++ b/Installation/cmake/modules/CGAL_UseRS3.cmake
@@ -40,6 +40,8 @@ if( RS3_FOUND AND NOT RS3_SETUP )
       message( STATUS "Using old RS signatures" )
     endif( RS3_OLD_INCLUDES )
 
+    include(CGAL_UseMPFI)
+
   set (RS3_SETUP TRUE)
 
   endif( RS3_FOUND AND NOT RS3_SETUP )
diff --git a/Installation/cmake/modules/FindRS.cmake b/Installation/cmake/modules/FindRS.cmake
index a44d333cb41..ab39259e8ef 100644
--- a/Installation/cmake/modules/FindRS.cmake
+++ b/Installation/cmake/modules/FindRS.cmake
@@ -12,7 +12,6 @@ endif()
 if( MPFI_FOUND )
 
   include( CGAL_VersionUtils )
-  include( ${MPFI_USE_FILE} )
 
   find_path(RS_INCLUDE_DIR
             NAMES rs_exports.h
diff --git a/Installation/cmake/modules/FindRS3.cmake b/Installation/cmake/modules/FindRS3.cmake
index 802cdc0c8f4..e592d0bf8ce 100644
--- a/Installation/cmake/modules/FindRS3.cmake
+++ b/Installation/cmake/modules/FindRS3.cmake
@@ -9,8 +9,6 @@ if ( RS_FOUND )
 
 if( MPFI_FOUND )
 
-  include( ${MPFI_USE_FILE} )
-  include( ${RS_USE_FILE} )
   include( CGAL_VersionUtils )
 
   find_path(RS3_INCLUDE_DIR
@@ -68,9 +66,9 @@ else( MPFI_FOUND )
 
 endif( MPFI_FOUND )
 
-else( RS3_FOUND )
+else( RS_FOUND )
 
-  message( STATUS "RS3 requires MPFI" )
+  message( STATUS "RS3 requires RS" )
   set( RS3_FOUND FALSE )
 
 endif( RS_FOUND )