diff --git a/etc/config.csh/CGAL b/etc/config.csh/CGAL
index 895cfd8e8..a4fb0bbad 100644
--- a/etc/config.csh/CGAL
+++ b/etc/config.csh/CGAL
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2014-2017 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -38,7 +38,7 @@
 
 set boost_version=boost-system
 set cgal_version=cgal-system
-#set cgal_version=CGAL-4.8
+#cgal_version=CGAL-4.10
 
 setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
 setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
@@ -49,14 +49,14 @@ if ($?FOAM_VERBOSE && $?prompt) then
     echo "    $boost_version at $BOOST_ARCH_PATH"
 endif
 
-if ( -d "$CGAL_ARCH_PATH" && "$cgal_version" != "cgal-system" ) then
-    _foamAddLib $CGAL_ARCH_PATH/lib
-endif
-
 if ( -d "$BOOST_ARCH_PATH" && "$boost_version" != "boost-system" ) then
     _foamAddLib $BOOST_ARCH_PATH/lib
 endif
 
+if ( -d "$CGAL_ARCH_PATH" && "$cgal_version" != "cgal-system" ) then
+    _foamAddLib $CGAL_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+endif
+
 unset boost_version cgal_version
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index 62c314cb6..431578df5 100644
--- a/etc/config.sh/CGAL
+++ b/etc/config.sh/CGAL
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2014-2017 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -37,7 +37,7 @@
 
 boost_version=boost-system
 cgal_version=cgal-system
-#cgal_version=CGAL-4.8.1
+#cgal_version=CGAL-4.10
 
 thirdPartyPath=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
 
@@ -57,7 +57,7 @@ then
     export CGAL_ARCH_PATH=$thirdPartyPath/$cgal_version
     if [ -d "$CGAL_ARCH_PATH" ]
     then
-        _foamAddLib $CGAL_ARCH_PATH/lib
+        _foamAddLib $CGAL_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
     fi
 else
     unset CGAL_ARCH_PATH
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index 8097684ee..22340bf70 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -9,6 +9,6 @@ CGAL_LIBS = \
     -L$(MPFR_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
     -L$(GMP_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
     -L$(BOOST_ARCH_PATH)/lib \
-    -L$(CGAL_ARCH_PATH)/lib \
+    -L$(CGAL_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
     -lCGAL \
     -lmpfr