diff --git a/.gitattributes b/.gitattributes
index 567014317ce..16e6cfc19ba 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -392,6 +392,7 @@ Coin/demo/Coin/Terrain/terrain.sln -text
 Coin/demo/Coin/Terrain/terrain.vcproj -text
 Coin/demo/Coin/Triangulation_3/triangulation_3.sln -text
 Coin/demo/Coin/Triangulation_3/triangulation_3.vcproj -text
+Configuration/config/testfiles/CGAL_CFG_SUNPRO_RWSTD.C -text
 Convex_hull_2/demo/Convex_hull_2/convex_hull_2.vcproj -text
 Convex_hull_2/doc_tex/Convex_hull_2/saarhull.eps -text
 Convex_hull_2/doc_tex/Convex_hull_2/saarhull.gif -text svneol=unset#unset
diff --git a/Configuration/config/testfiles/CGAL_CFG_SUNPRO_RWSTD.C b/Configuration/config/testfiles/CGAL_CFG_SUNPRO_RWSTD.C
new file mode 100644
index 00000000000..d93a6499a54
--- /dev/null
+++ b/Configuration/config/testfiles/CGAL_CFG_SUNPRO_RWSTD.C
@@ -0,0 +1,45 @@
+// Copyright (c) 2004  Utrecht University (The Netherlands),
+// ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany),
+// INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg
+// (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria),
+// and Tel-Aviv University (Israel).  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: svn+ssh://scm.gforge.inria.fr/svn/cgal/trunk/Configuration/config/testfiles/CGAL_CFG_SUNPRO_RWSTD.C $
+// $Id: CGAL_CFG_SUNPRO_RWSTD.C 28738 2006-02-23 14:30:13Z glisse $
+// 
+//
+// Author(s)     : Marc Glisse
+
+// ---------------------------------------------------------------------
+// A short test program to evaluate a C++ compiler.
+// This program is used by cgal_configure.
+// The following documentation will be pasted in the generated configfile.
+// ---------------------------------------------------------------------
+
+//| This flag is set if the compiler is Sun's compiler and it uses the
+//| old Rogue Wave STL.
+//| The workarounds consist in faking iterator_traits and using a wrapper
+//| to reverse_iterator
+
+#ifdef __SUNPRO_CC
+#include <iterator>
+#ifdef _RWSTD_NO_CLASS_PARTIAL_SPEC
+#error This is Sun Studio using the old RWSTD
+#endif
+#endif
+
+int main()
+{
+  return 0;
+}