diff --git a/.gitattributes b/.gitattributes
index 59bb9514ee1..175c12084f5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1748,7 +1748,6 @@ Installation/lib/CGAL-3.4/CGAL_SetupGMPXX.cmake -text
 Installation/lib/CGAL-3.4/CGAL_SetupLEDA.cmake -text
 Installation/lib/CGAL-3.4/CGAL_SetupMPFR.cmake -text
 Installation/lib/CGAL-3.4/CGAL_UseBLAS.cmake -text
-Installation/lib/CGAL-3.4/CGAL_UseBoostProgramOptions.cmake -text
 Installation/lib/CGAL-3.4/CGAL_UseLAPACK.cmake -text
 Installation/lib/CGAL-3.4/CGAL_UseTAUCS.cmake -text
 Installation/lib/CGAL-3.4/FindBLAS.cmake -text
diff --git a/Installation/lib/CGAL-3.4/CGAL_UseBoostProgramOptions.cmake b/Installation/lib/CGAL-3.4/CGAL_UseBoostProgramOptions.cmake
deleted file mode 100644
index 0a03f8b6a9b..00000000000
--- a/Installation/lib/CGAL-3.4/CGAL_UseBoostProgramOptions.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-if ( NOT Boost_PROGRAM_OPTIONS_FOUND )
-  
-  if ( NOT BUILD_SHARED_LIBS )
-    set(Boost_USE_STATIC_LIBS ON)
-  endif()
-  
-  set(Boost_FIND_VERSION 1.33.1 )
-  set(Boost_FIND_VERSION_MAJOR 1 )
-  set(Boost_FIND_VERSION_MINOR 33 )
-  set(Boost_FIND_VERSION_PATCH 1 )
-  
-  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()
-  
-  else()
-  
-    message( STATUS "Could not find Boost.ProgramOptions library" )
-    
-  endif()
-  
-endif()
-
diff --git a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
index ea858289b12..800112d67bd 100644
--- a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
+++ b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
@@ -24,7 +24,11 @@ if ( CGAL_FOUND )
     include( ${LAPACK_USE_FILE} )
 
     # Link with Boost.ProgramOptions (optional)
-    include( CGAL_UseBoostProgramOptions )
+    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()
 
     create_single_source_cgal_program( "Mesh_estimation.cpp" )
     create_single_source_cgal_program( "Single_estimation.cpp" )
diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt b/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt
index 35bfcab5c63..c10eafaac77 100644
--- a/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt
+++ b/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt
@@ -33,9 +33,12 @@ if ( CGAL_FOUND )
 
     include_directories (BEFORE include)
     
-    include( CGAL_UseBoostProgramOptions )
-    
+    # Link with Boost.ProgramOptions (optional)
     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()
 
     # Demo KDS_Delaunay_triangulation_2
     add_executable  (KDS_Delaunay_triangulation_2 KDS_Delaunay_triangulation_2.cpp)
diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
index b5bd20344ca..e6b58c2561d 100644
--- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
+++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
@@ -37,7 +37,11 @@ if ( CGAL_FOUND )
   include( CGAL_CreateSingleSourceCGALProgram )
 
   # Link with Boost.ProgramOptions (optional)
-  include( CGAL_UseBoostProgramOptions )
+  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()
 
   include_directories (BEFORE include)