diff --git a/Installation/include/CGAL/auto_link/TAUCS.h b/Installation/include/CGAL/auto_link/TAUCS.h
index dff83cf1b5c..dc209ba6161 100644
--- a/Installation/include/CGAL/auto_link/TAUCS.h
+++ b/Installation/include/CGAL/auto_link/TAUCS.h
@@ -26,52 +26,20 @@
 // Skip the whole file if auto-link is off
 #if !defined(CGAL_NO_AUTOLINK_TAUCS) && !defined(CGAL_NO_AUTOLINK)
 
+#  if defined(_WIN32) || defined(_WIN64) 
 
-#if defined(_WIN32) && !defined(_WIN64) // if Windows 32 bits
+#    define CGAL_LIB_NAME libtaucs
+#    define CGAL_AUTO_LINK_NOMANGLE
+#    include <CGAL/auto_link/auto_link.h>
 
-// CGAL ships with TAUCS for Windows 32 bits, i.e this set of libraries (e.g. for VC++ 8 /MD):
-// libtaucs-vc80-mt.lib libmetis-vc80-mt.lib liblapack.lib libf77blas.lib libcblas.lib libatlas.lib vcf2c-vc80-mt.lib
-//
-// Notes: - Order matters.
-//        - Libraries with no "vc" toolset are compiled by gcc/g77. They are
-//          compatible with VC++ 7.1, 8.0 and 9.0, and with all VC++ runtimes.
-//        - Tested with 7.1, 8.0 and 9.0.
-
-#define CGAL_LIB_NAME libtaucs
-#include <CGAL/auto_link/auto_link.h>
-
-#define CGAL_LIB_NAME libmetis
-#include <CGAL/auto_link/auto_link.h>
+#    define CGAL_LIB_NAME libmetis
+#    define CGAL_AUTO_LINK_NOMANGLE
+#    include <CGAL/auto_link/auto_link.h>
 
 // Link with LAPACK, BLAS and F2C
-#include <CGAL/auto_link/LAPACK.h>
-
-#endif // Win32
-
-
-#ifdef _WIN64 // if Windows 64 bits
-
-// ATLAS is not compatible with Win64, thus CGAL ships with CLAPACK and CBLAS.
-// VC++ >= 8.0 is compatible with Windows 64 bits.
-// The set set of libraries is (e.g. for VC++ 8 /MD):
-// libtaucs-vc80-mt.lib libmetis-vc80-mt.lib clapack-vc80-mt.lib blas-vc80-mt.lib vcf2c-vc80-mt.lib
-//
-// Notes: - Order matters.
-//        - Tested with VC++ 8.0 and 9.0.
-
-#define CGAL_LIB_NAME libtaucs
-#define CGAL_AUTO_LINK_NOMANGLE
-#include <CGAL/auto_link/auto_link.h>
-
-#define CGAL_LIB_NAME libmetis
-#define CGAL_AUTO_LINK_NOMANGLE
-#include <CGAL/auto_link/auto_link.h>
-
-// Link with LAPACK, BLAS and F2C
-#include <CGAL/auto_link/LAPACK.h>
-
-#endif // _WIN64
+#    include <CGAL/auto_link/LAPACK.h>
 
+#  endif // Win32|Win64
 
 #endif // CGAL_NO_AUTOLINK_TAUCS && CGAL_NO_AUTOLINK