diff --git a/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt
index 4b8dafdee9f..b4d266e0d87 100644
--- a/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt
+++ b/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt
@@ -26,6 +26,7 @@ if ( CGAL_FOUND )
   if(LAPACK_FOUND)
 
     include( ${LAPACK_USE_FILE} )
+
     create_single_source_cgal_program( "blind_1pt.cpp" )
 
   else(LAPACK_FOUND)
@@ -34,7 +35,6 @@ if ( CGAL_FOUND )
 
   endif(LAPACK_FOUND)
 
-
 else()
 
   message(STATUS "NOTICE: This program requires the CGAL library, and will not be compiled.")
diff --git a/Ridges_3/examples/Ridges_3/CMakeLists.txt b/Ridges_3/examples/Ridges_3/CMakeLists.txt
index ab947f12e4d..d70add0e42c 100644
--- a/Ridges_3/examples/Ridges_3/CMakeLists.txt
+++ b/Ridges_3/examples/Ridges_3/CMakeLists.txt
@@ -16,23 +16,32 @@ if ( CGAL_FOUND )
   include( ${CGAL_USE_FILE} )
   include( CGAL_CreateSingleSourceCGALProgram )
 
-  find_package(LAPACK QUIET)
-
+  # Link with BLAS and LAPACK (required)
+  find_package(LAPACK)
   if(LAPACK_FOUND)
+
     include( ${LAPACK_USE_FILE} )
 
-    find_package( Boost QUIET COMPONENTS program_options )
-    if( Boost_PROGRAM_OPTIONS_FOUND )
-      add_definitions( -DCGAL_USE_BOOST_PROGRAM_OPTIONS )
-      link_libraries( ${Boost_PROGRAM_OPTIONS_LIBRARY} )
-    endif( Boost_PROGRAM_OPTIONS_FOUND )
+    # Link with Boost.ProgramOptions (optional)
+    find_package(Boost QUIET COMPONENTS program_options)
+    if(Boost_PROGRAM_OPTIONS_FOUND)
+      if( CGAL_AUTO_LINK_ENABLED )
+        message( STATUS "Boost.ProgramOptions library: found" )
+      else()
+        message( STATUS "Boost.ProgramOptions library: ${Boost_PROGRAM_OPTIONS_LIBRARY}" )
+      endif()
+      add_definitions( "-DCGAL_USE_BOOST_PROGRAM_OPTIONS" )
+      if ( NOT CGAL_AUTO_LINK_ENABLED )
+        link_libraries( ${Boost_PROGRAM_OPTIONS_LIBRARY} )
+      endif()
+    endif()
 
     add_executable(Compute_Ridges_Umbilics Compute_Ridges_Umbilics.cpp PolyhedralSurf.cpp)
     target_link_libraries(Compute_Ridges_Umbilics ${CGAL_LIBRARIES})
 
   else(LAPACK_FOUND)
 
-    message(STATUS "NOTICE: This program needs the LAPACK API and will not be compiled.")
+    message(STATUS "NOTICE: This program requires LAPACK, and will not be compiled.")
 
   endif(LAPACK_FOUND)
 
diff --git a/Ridges_3/test/Ridges_3/CMakeLists.txt b/Ridges_3/test/Ridges_3/CMakeLists.txt
index bed5ea20a35..a6111e3ea14 100644
--- a/Ridges_3/test/Ridges_3/CMakeLists.txt
+++ b/Ridges_3/test/Ridges_3/CMakeLists.txt
@@ -17,10 +17,11 @@ find_package(CGAL QUIET COMPONENTS Core )
 if ( CGAL_FOUND )
 
   include( ${CGAL_USE_FILE} )
+
   include( CGAL_CreateSingleSourceCGALProgram )
 
-
-  find_package(LAPACK QUIET)
+  # Link with BLAS and LAPACK (required)
+  find_package(LAPACK)
 
   if(LAPACK_FOUND)
 
@@ -30,13 +31,13 @@ if ( CGAL_FOUND )
 
   else(LAPACK_FOUND)
   
-    message(STATUS "NOTICE: This program needs the LAPACK API and will not be compiled.")
+    message(STATUS "NOTICE: This program requires LAPACK, and will not be compiled.")
 
   endif(LAPACK_FOUND)
 
 else()
   
-    message(STATUS "This program requires the CGAL library, and will not be compiled.")
+  message(STATUS "NOTICE: This program requires the CGAL library, and will not be compiled.")
   
 endif()