diff --git a/.gitattributes b/.gitattributes
index e830dbbf7cd..732d741e08b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -627,6 +627,7 @@ HalfedgeDS/doc_tex/HalfedgeDS_ref/fig/hds_optional_small.gif -text svneol=unset#
 Installation/LICENSE.FREE_USE -text
 Installation/config/support/S05-BOOST -text
 Installation/config/support/S06-BOOST_PROGRAM_OPTIONS -text
+Installation/config/support/S07-BOOST_BIMAP -text
 Installation/config/support/S15-X11 -text
 Installation/config/support/S20-GMP -text
 Installation/config/support/S21-GMPXX -text
diff --git a/Installation/config/support/S07-BOOST_BIMAP b/Installation/config/support/S07-BOOST_BIMAP
new file mode 100644
index 00000000000..0bba28c8e30
--- /dev/null
+++ b/Installation/config/support/S07-BOOST_BIMAP
@@ -0,0 +1,21 @@
+# The Boost.Bimap library
+# http://cablemodem.fibertel.com.ar/mcape/boost/libs/bimap/index.html
+#
+# To be included in Boost:
+# http://lists.boost.org/Archives/boost/2007/03/117351.php
+
+
+DESCRIPTION = Boost.Bimap library
+PROVIDES = BOOST_BIMAP
+CXXFLAGS = 
+LDFLAGS = 
+LIBS = 
+REQUIRES = 
+INCOMPATIBLE = 
+STDINCLDIRS = /usr/include/\*
+INCLTHING = boost/bimap/bimap.hpp
+STDLIBDIRS = 
+LIBTHING = 
+COMPILETESTFLAGS = 
+
+# EOF
diff --git a/Installation/config/support/test_BOOST_BIMAP.cpp b/Installation/config/support/test_BOOST_BIMAP.cpp
new file mode 100644
index 00000000000..1a8d29b8698
--- /dev/null
+++ b/Installation/config/support/test_BOOST_BIMAP.cpp
@@ -0,0 +1,44 @@
+// Copyright (c) 2007  INRIA Sophia Antipolis (France)
+// All rights reserved.
+//
+// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation; version 2.1 of the License.
+// See the file LICENSE.LGPL distributed with CGAL.
+//
+// Licensees holding a valid commercial license may use this file in
+// accordance with the commercial license agreement provided with the software.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// $URL$
+// $Id$
+// 
+//
+// Author(s)     : Laurent Rineau
+
+// Tests if Boost.Bimap is available.
+
+#include <iostream>
+#include <boost/bimap/bimap.hpp>
+
+using boost::bimap::bimap;
+using boost::bimap::set_of;
+
+int main()
+{
+  bimap<set_of<int,    std::less<int>    >,
+        set_of<double, std::less<double> >
+    > function;
+
+  function.left[1] = 2.;
+
+  if( function.right[2.] == 1 )
+  {
+    std::cout << "ok for Boost.Bimap\n";
+    return 0;
+  }
+  else
+    return 1;
+}