diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc24d6075c3a69fd8d0e3206d6c6c613ba945bdf..65976d25f46d1d60c94ac71a64b3684755de2693 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -748,6 +748,8 @@ if(HAVE_MESH OR HAVE_SOLVER)
 endif(HAVE_MESH OR HAVE_SOLVER)
 
 if(HAVE_MESH)
+  set_config_option(HAVE_TETGENBR "TetGen/BR")
+
   if(ENABLE_VORO3D)
     add_subdirectory(contrib/voro++)
     include_directories(contrib/voro++/src)
@@ -792,7 +794,7 @@ if(HAVE_MESH)
   if(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
     add_subdirectory(contrib/Tetgen1.5)
     include_directories(contrib/Tetgen1.5)
-    set_config_option(HAVE_TETGEN "Tetgen(1.5)")
+    set_config_option(HAVE_TETGEN "Tetgen1.5")
     add_definitions(-DTETLIBRARY)
   elseif(ENABLE_TETGEN)
     find_library(TETGEN_LIB tet PATH_SUFFIXES lib)
@@ -1315,7 +1317,7 @@ endif(NOWARN)
 check_cxx_compiler_flag("-O0" NOOPT)
 if(NOOPT)
   file(GLOB_RECURSE NOOPT_SRC Mesh/BDS.cpp Parser/Gmsh.tab.cpp
-       contrib/Tetgen*/predicates.cxx)
+       contrib/Tetgen1.5/predicates.cxx)
   foreach(FILE ${NOOPT_SRC})
     get_source_file_property(PROP ${FILE} COMPILE_FLAGS)
     if(PROP)
diff --git a/doc/CREDITS.txt b/doc/CREDITS.txt
index 4ab4128a2224cd28b0b01b7919a961678729f85d..f5da477a5b4464aaa29e55bc1c5f6e66cb2eb88f 100644
--- a/doc/CREDITS.txt
+++ b/doc/CREDITS.txt
@@ -23,27 +23,27 @@ Bechet (solver), Gilles Marckmann (camera and stero mode), Ashish Negi
 (Salome/Netgen CAD healing), Trevor Strickler (structured/unstructured coupling
 with pyramids), Amaury Johnen (Bezier), Benjamin Ruard (Java wrappers), Maxime
 Graulich (iOS/Android port), Francois Henrotte (onelab metamodels), Sebastian
-Eiser (PGF output), Alexis Salzman (compressed IO). See comments in the sources
-for more information. If we forgot to list your contributions please send us an
-email!
+Eiser (PGF output), Alexis Salzman (compressed IO), Hang Si (TetGen/BR boundary
+recovery code). See comments in the sources for more information. If we forgot
+to list your contributions please send us an email!
 
-The TetGen/BR code (Mesh/tetgenBR.*) is copyright (c) 2016 Hang Si, Weierstrass
+The TetGen/BR code (Mesh/tetgenBR.{cpp,h}) is copyright (c) 2016 Hang Si, Weierstrass
 Institute for Applied Analysis and Stochatics.
 
-The AVL tree code (Common/avl.*) and the YUV image code (Graphics/gl2yuv.*) are
-copyright (C) 1988-1993, 1995 The Regents of the University of
-California. Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting documentation,
-and that the name of the University of California not be used in advertising or
-publicity pertaining to distribution of the software without specific, written
-prior permission. The University of California makes no representations about
-the suitability of this software for any purpose. It is provided "as is" without
-express or implied warranty.
-
-The trackball code (Graphics/Trackball.*) is copyright (C) 1993, 1994, Silicon
-Graphics, Inc. ALL RIGHTS RESERVED. Permission to use, copy, modify, and
+The AVL tree code (Common/avl.{cpp,h}) and the YUV image code
+(Graphics/gl2yuv.{cpp,h}) are copyright (C) 1988-1993, 1995 The Regents of the
+University of California. Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without fee is hereby
+granted, provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in supporting
+documentation, and that the name of the University of California not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. The University of California makes no
+representations about the suitability of this software for any purpose. It is
+provided "as is" without express or implied warranty.
+
+The trackball code (Graphics/Trackball.{cpp.h}) is copyright (C) 1993, 1994,
+Silicon Graphics, Inc. ALL RIGHTS RESERVED. Permission to use, copy, modify, and
 distribute this software for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that both the
 copyright notice and this permission notice appear in supporting documentation,
@@ -93,7 +93,7 @@ configuration options.
 This version of Gmsh may contain code (in the contrib/Netgen subdirectory)
 copyright (C) 1994-2004 Joachim Sch"oberl: check the configuration options.
 
-This version of Gmsh may contain code (in the contrib/Tetgen subdirectory)
+This version of Gmsh may contain code (in the contrib/Tetgen1.5 subdirectory)
 copyright (C) 2002-2007 Hang Si: check the configuration options.
 
 This version of Gmsh may contain code (in the contrib/Salome subdirectory)