diff --git a/applications/utilities/mesh/generation/CV2DMesher/Make/options b/applications/utilities/mesh/generation/CV2DMesher/Make/options
index 9794e9e08a..b95ec32539 100755
--- a/applications/utilities/mesh/generation/CV2DMesher/Make/options
+++ b/applications/utilities/mesh/generation/CV2DMesher/Make/options
@@ -1,26 +1,21 @@
-
-// EXE_DEBUG = -DFULLDEBUG -g -O0
+//EXE_DEBUG = -DFULLDEBUG -g -O0
 EXE_FROUNDING_MATH = -frounding-math
 EXE_NDEBUG = -DNDEBUG
 
 include $(GENERAL_RULES)/CGAL
-FFLAGS = -DCGAL_FILES='"${CGAL_SRC}/src/CGAL/files"'
+FFLAGS = -DCGAL_FILES='"${CGAL_ARCH_PATH}/share/files"'
 
 EXE_INC = \
     ${EXE_FROUNDING_MATH} \
     ${EXE_NDEBUG} \
     ${CGAL_INC} \
-    -I$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1 \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
-    -L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
-    -L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
+    $(CGAL_LIBS) \
     -lmeshTools \
     -ltriSurface \
-    -ldynamicMesh \
-    -lboost_thread \
-    -lmpfr
+    -ldynamicMesh
diff --git a/applications/utilities/mesh/generation/CV3DMesher/Make/options b/applications/utilities/mesh/generation/CV3DMesher/Make/options
index 445a2ee843..b95ec32539 100644
--- a/applications/utilities/mesh/generation/CV3DMesher/Make/options
+++ b/applications/utilities/mesh/generation/CV3DMesher/Make/options
@@ -3,23 +3,19 @@ EXE_FROUNDING_MATH = -frounding-math
 EXE_NDEBUG = -DNDEBUG
 
 include $(GENERAL_RULES)/CGAL
-FFLAGS = -DCGAL_FILES='"${CGAL_SRC}/src/CGAL/files"'
+FFLAGS = -DCGAL_FILES='"${CGAL_ARCH_PATH}/share/files"'
 
 EXE_INC = \
     ${EXE_FROUNDING_MATH} \
     ${EXE_NDEBUG} \
     ${CGAL_INC} \
-    -I$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1 \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
-    -L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
-    -L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
+    $(CGAL_LIBS) \
     -lmeshTools \
     -ltriSurface \
-    -ldynamicMesh \
-    -lboost_thread \
-    -lmpfr
+    -ldynamicMesh
diff --git a/etc/settings.csh b/etc/settings.csh
index 627d7099a9..3132ecdf3b 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -85,21 +85,18 @@ case OpenFOAM:
     switch ("$WM_COMPILER")
     case Gcc:
         setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.3
-        setenv MPFR_HOME $WM_THIRD_PARTY_DIR/mpfr-2.4.2
         setenv MPFR_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.2
         _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-5.0.1/lib
     breaksw
     case Gcc442:
         setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.2
-        setenv MPFR_HOME $WM_THIRD_PARTY_DIR/mpfr-2.4.1
         setenv MPFR_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1
         _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
     breaksw
     case Gcc43:
         setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.3.3
-        setenv MPFR_HOME $WM_THIRD_PARTY_DIR/mpfr-2.4.1
         setenv MPFR_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1
         _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
@@ -267,14 +264,14 @@ endif
 
 # CGAL and boost
 # ~~~~~~~~~~~~~~
-set cgal_version=3.6
-setenv CGAL_SRC $WM_THIRD_PARTY_DIR/CGAL-$cgal_version
+set cgal_version=3.5.1
+setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/CGAL-$cgal_version
 
 set boost_version=1_42_0
-setenv BOOST_ROOT $WM_THIRD_PARTY_DIR/boost_$boost_version
+setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/boost_$boost_version
 
-_foamAddLib $BOOST_ROOT/platforms/$WM_OPTIONS/lib
-_foamAddLib $CGAL_SRC/lib
+_foamAddLib $BOOST_ARCH_PATH/lib
+_foamAddLib $CGAL_ARCH_PATH/lib
 
 unset cgal_version boost_version
 
diff --git a/etc/settings.sh b/etc/settings.sh
index d35dc50c8f..75146e19c2 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -113,28 +113,24 @@ OpenFOAM)
     case "$WM_COMPILER" in
     Gcc)
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.3
-        export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.2
         export MPFR_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.2
         _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-5.0.1/lib
         ;;
     Gcc442)
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.2
-        export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
         export MPFR_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1
         _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
         ;;
     Gcc44)
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.2
-        export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
         export MPFR_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1
         _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
         ;;
     Gcc43)
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.3.3
-        export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
         export MPFR_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1
         _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
@@ -311,14 +307,14 @@ export MPI_BUFFER_SIZE
 
 # CGAL and boost
 # ~~~~~~~~~~~~~~
-cgal_version=3.6
-export CGAL_SRC=$WM_THIRD_PARTY_DIR/CGAL-$cgal_version
+cgal_version=3.5.1
+export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/CGAL-$cgal_version
 
 boost_version=1_42_0
-export BOOST_ROOT=$WM_THIRD_PARTY_DIR/boost_$boost_version
+export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/boost_$boost_version
 
-_foamAddLib $BOOST_ROOT/platforms/$WM_OPTIONS/lib
-_foamAddLib $CGAL_SRC/lib
+_foamAddLib $BOOST_ARCH_PATH/lib
+_foamAddLib $CGAL_ARCH_PATH/lib
 
 unset cgal_version boost_version
 
diff --git a/src/mesh/conformalVoronoiMesh/Make/options b/src/mesh/conformalVoronoiMesh/Make/options
index c5190e2bfd..17517a7737 100644
--- a/src/mesh/conformalVoronoiMesh/Make/options
+++ b/src/mesh/conformalVoronoiMesh/Make/options
@@ -3,7 +3,7 @@ EXE_FROUNDING_MATH = -frounding-math
 EXE_NDEBUG = -DNDEBUG
 
 include $(GENERAL_RULES)/CGAL
-FFLAGS = -DCGAL_FILES='"${CGAL_SRC}/src/CGAL/files"'
+FFLAGS = -DCGAL_FILES='"${CGAL_ARCH_PATH}/share/files"'
 
 EXE_INC = \
     ${EXE_FROUNDING_MATH} \
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index d13caeaf24..bb99822c20 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -1,11 +1,11 @@
 CGAL_INC = \
     -Wno-old-style-cast \
-    -I${CGAL_SRC}/include \
-    -I$(MPFR_HOME) \
-    -I${BOOST_ROOT}/include/boost
+    -I${CGAL_ARCH_PATH}/include \
+    -I$(MPFR_ARCH_PATH)/include \
+    -I${BOOST_ARCH_PATH}/include/boost
 
 CGAL_LIBS = \
     -L$(MPFR_ARCH_PATH)/lib \
-    -L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
+    -L$(BOOST_ARCH_PATH)/lib \
     -lmpfr \
     -lboost_thread