diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 3e7e7cde55..17f4a1e173 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -285,18 +285,20 @@ IF(libCGAL)
             list(APPEND CGAL_LIBRARIES "${lib_path}")
         endforeach()
 ELSE()
-        FILE(GLOB CGAL_LIBRARIES ${CGAL_LIBRARY_DIR}/CGAL*.lib)
+        FILE(GLOB CGAL_LIBRARIES ${CGAL_LIBRARY_DIR}/*CGAL*.lib)
+        message(STATUS CGAL_LIBRARIES ${CGAL_LIBRARIES})
         LIST(LENGTH CGAL_LIBRARY_NAMES num_cgal_library_names)
         LIST(LENGTH CGAL_LIBRARIES num_cgal_libraries)
+        message(STATUS ${num_cgal_library_names} ${num_cgal_libraries})
         LINK_DIRECTORIES("${CGAL_LIBRARY_DIR}")
-        if(NOT "${num_cgal_library_names}" STREQUAL "${num_cgal_library_names}")
+        if(NOT "${num_cgal_library_names}" STREQUAL "${num_cgal_libraries}")
             MESSAGE(FATAL_ERROR "Unable to find CGAL library files, aborting")
         endif()
         MESSAGE(STATUS "CGAL library files found")
 ENDIF()
-# TODO: Remove hardcoded version numbers for windows
-FIND_LIBRARY(libGMP NAMES gmp "libgmp-10" PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
-FIND_LIBRARY(libMPFR NAMES mpfr "libmpfr-4" PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+FIND_LIBRARY(libGMP NAMES gmp mpir PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
+FIND_LIBRARY(libMPFR NAMES mpfr PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
 IF(NOT libGMP)
         MESSAGE(FATAL_ERROR "Unable to find GMP library files, aborting")
 ENDIF()
@@ -306,9 +308,6 @@ ENDIF()
 list(APPEND CGAL_LIBRARIES "${libMPFR}")
 list(APPEND CGAL_LIBRARIES "${libGMP}")
 
-
-
-
 if(MSVC)
     add_definitions(-DHAVE_NO_DLL)
     add_debug_variants(OPENCASCADE_LIBRARIES "${OPENCASCADE_LIBRARIES}" d)
diff --git a/win/build-deps.cmd b/win/build-deps.cmd
index d4bae43551..56ea0b66fd 100644
--- a/win/build-deps.cmd
+++ b/win/build-deps.cmd
@@ -437,6 +437,27 @@ IF NOT EXIST "%INSTALL_DIR%\mpfr". mkdir "%INSTALL_DIR%\mpfr"
 copy lib\%VS_PLATFORM%\Release\* "%INSTALL_DIR%\mpfr"
 IF NOT %ERRORLEVEL%==0 GOTO :Error
 
+:cgal
+set DEPENDENCY_NAME=mpfr
+set DEPENDENCY_DIR=%DEPS_DIR%\cgal
+call :GitCloneAndCheckoutRevision https://github.com/CGAL/cgal.git "%DEPENDENCY_DIR%" releases/CGAL-4.13.1
+IF NOT %ERRORLEVEL%==0 GOTO :Error
+cd "%DEPENDENCY_DIR%"
+call :RunCMake -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%\cgal"    ^
+               -DBOOST_ROOT="%DEPS_DIR%\boost_%BOOST_VER%"    ^
+               -DGMP_INCLUDE_DIR="%INSTALL_DIR%\mpir"         ^
+               -DGMP_LIBRARIES="%INSTALL_DIR%\mpir\mpir.lib"  ^
+               -DMPFR_INCLUDE_DIR="%INSTALL_DIR%\mpfr"        ^
+               -DMPFR_LIBRARIES="%INSTALL_DIR%\mpfr\mpfr.lib" ^
+               -DCGAL_BUILD_SHARED_LIBS=Off                   ^
+               -DBUILD_SHARED_LIBS=Off                        ^
+               -DBOOST_LIBRARYDIR="%DEPS_DIR%\boost_%BOOST_VER%\stage\vs%VS_VER%-%VS_PLATFORM%\lib"
+IF NOT %ERRORLEVEL%==0 GOTO :Error
+call :BuildSolution "%DEPENDENCY_DIR%\%BUILD_DIR%\CGAL.sln" %BUILD_CFG%
+IF NOT %ERRORLEVEL%==0 GOTO :Error
+call :InstallCMakeProject "%DEPENDENCY_DIR%\%BUILD_DIR%" %BUILD_CFG%
+IF NOT %ERRORLEVEL%==0 GOTO :Error
+
 :Successful
 echo.
 call "%~dp0\utils\cecho.cmd" 0 10 "%PROJECT_NAME% dependencies built."
diff --git a/win/run-cmake.bat b/win/run-cmake.bat
index 8154b3a4bc..48a2dec6fe 100755
--- a/win/run-cmake.bat
+++ b/win/run-cmake.bat
@@ -78,6 +78,12 @@ set PYTHON_EXECUTABLE=%PYTHONHOME%\python.exe
 set SWIG_DIR=%INSTALL_DIR%\swigwin
 set PATH=%PATH%;%SWIG_DIR%;%PYTHONHOME%
 set JSON_INCLUDE_DIR=%INSTALL_DIR%\json
+set CGAL_INCLUDE_DIR=%INSTALL_DIR%\cgal\include
+set CGAL_LIBRARY_DIR=%INSTALL_DIR%\cgal\lib
+set GMP_INCLUDE_DIR=%INSTALL_DIR%\mpir
+set GMP_LIBRARY_DIR=%INSTALL_DIR%\mpir
+set MPFR_INCLUDE_DIR=%INSTALL_DIR%\mpfr
+set MPFR_LIBRARY_DIR=%INSTALL_DIR%\mpfr
 
 echo.
 call cecho.cmd 0 10 "Script configuration:"
@@ -99,6 +105,12 @@ echo    PYTHON_LIBRARY          = %PYTHON_LIBRARY%
 echo    PYTHON_EXECUTABLE       = %PYTHON_EXECUTABLE%
 echo    SWIG_DIR                = %SWIG_DIR%
 echo    JSON_INCLUDE_DIR        = %JSON_INCLUDE_DIR%
+echo    CGAL_INCLUDE_DIR        = %CGAL_INCLUDE_DIR%
+echo    CGAL_LIBRARY_DIR        = %CGAL_LIBRARY_DIR%
+echo    GMP_INCLUDE_DIR         = %GMP_INCLUDE_DIR%
+echo    GMP_LIBRARY_DIR         = %GMP_LIBRARY_DIR%
+echo    MPFR_INCLUDE_DIR        = %MPFR_INCLUDE_DIR%
+echo    MPFR_LIBRARY_DIR        = %MPFR_LIBRARY_DIR%
 echo.
 echo    CMAKE_INSTALL_PREFIX    = %CMAKE_INSTALL_PREFIX%
 echo.