diff --git a/Core/src/CGALCore/CMakeLists.txt b/Core/src/CGALCore/CMakeLists.txt
index e13ae96a9fd..10e9cd6adbd 100644
--- a/Core/src/CGALCore/CMakeLists.txt
+++ b/Core/src/CGALCore/CMakeLists.txt
@@ -2,7 +2,7 @@ message(STATUS "Configure libCGALCore")
  
 use_lib( GMP )
 use_lib( MPFR )
-if (FOUND_GMPXX) 
+if (GMPXX_FOUND) 
   use_lib( GMPXX )
 endif()
 
diff --git a/GraphicsView/src/CGALQt4/CMakeLists.txt b/GraphicsView/src/CGALQt4/CMakeLists.txt
index b0ae63a76d2..d28dc679787 100644
--- a/GraphicsView/src/CGALQt4/CMakeLists.txt
+++ b/GraphicsView/src/CGALQt4/CMakeLists.txt
@@ -59,7 +59,7 @@ if( QT4_FOUND )
 
     use_lib( GMP )
     use_lib( MPFR )
-    if (FOUND_GMPXX) 
+    if (GMPXX_FOUND) 
       use_lib( GMPXX )
     endif()
 
diff --git a/Installation/cmake/modules/UseCGAL.cmake b/Installation/cmake/modules/UseCGAL.cmake
index e15382bb9cc..3f771cc5f7b 100644
--- a/Installation/cmake/modules/UseCGAL.cmake
+++ b/Installation/cmake/modules/UseCGAL.cmake
@@ -27,9 +27,13 @@ if(NOT USE_CGAL_FILE_INCLUDED)
 
   endforeach()
 
-  # these two are mandatory
+  # these two and a half are mandatory
   use_component( GMP )
   use_component( MPFR )
+  if (GMPXX_FOUND) 
+    use_component( GMPXX )
+  endif()
+
     
   include_directories( "${CMAKE_CURRENT_BINARY_DIR}" ) 
 
diff --git a/Installation/src/CGAL/CMakeLists.txt b/Installation/src/CGAL/CMakeLists.txt
index 8efa2ab922e..939b35b5c03 100644
--- a/Installation/src/CGAL/CMakeLists.txt
+++ b/Installation/src/CGAL/CMakeLists.txt
@@ -2,7 +2,7 @@ message(STATUS "Configure libCGAL")
 
 use_lib( GMP )
 use_lib( MPFR)
-if (FOUND_GMPXX) 
+if (GMPXX_FOUND) 
   use_lib( GMPXX )
 endif()
 
diff --git a/Qt_widget/src/CGALQt3/CMakeLists.txt b/Qt_widget/src/CGALQt3/CMakeLists.txt
index 4d740fbff54..985a6e76472 100644
--- a/Qt_widget/src/CGALQt3/CMakeLists.txt
+++ b/Qt_widget/src/CGALQt3/CMakeLists.txt
@@ -40,7 +40,7 @@ if( QT3_FOUND )
 
     use_lib( GMP )
     use_lib( MPFR )
-    if (FOUND_GMPXX) 
+    if (GMPXX_FOUND) 
       use_lib( GMPXX )
     endif()