diff --git a/status/compiler.cfg b/status/compiler.cfg
index 5499fa4e3a..025373a442 100644
--- a/status/compiler.cfg
+++ b/status/compiler.cfg
@@ -2,6 +2,11 @@
 //
 // The first command template is for compile only tests
 // The second command template is for compile and link (and possibly run) tests
+//
+// Change log:
+// 20 Jan 2001 - Turned on STLPort debug mode and turned off incremental linking
+//               for vc6 builds. Added cygwin build. Waiting for a fix for
+//               cygwin/stlport to add that (David Abrahams).
 
 linux
 gcc
@@ -111,22 +116,36 @@ Metrowerks<br>CodeWarrior<br>6.0
 win32
 vc
 Microsoft Visual C++
-cl /c /nologo /Zm400 /MDd /W3 /GR /GX /Zi /Od /GZ /I "%include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" %source
-cl /Feboosttmp.exe /nologo /Zm400 /MDd /W3 /GR /GX /Zi /Od /GZ /I "%include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" %source /link user32.lib
+cl /c /nologo /Zm400 /MDd /W3 /GR /GX /Zi /Od /GZ /I"%include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" %source
+cl /Feboosttmp.exe /nologo /Zm400 /MDd /W3 /GR /GX /Zi /Od /GZ /I"%include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" %source /link /incremental:no user32.lib
 Microsoft<br>VC++<br>6.0 SP4
 
 win32
 vc-stlport
 Microsoft Visual C++ with STLport
-cl /c /nologo /Zm400 /MDd /W3 /GR /GX /Zi /Od /GZ /I "$BOOST_STLPORT_PATH/stlport" /I "%include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" %source
-cl /Feboosttmp.exe /nologo /Zm400 /MDd /W3 /GR /GX /Zi /Od /GZ /I "$BOOST_STLPORT_PATH/stlport" /I "%include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" %source /link /libpath:$BOOST_STLPORT_PATH\lib user32.lib
+cl /c /nologo /Zm400 /MDd /W3 /GR /GX /Zi /Od /GZ /I "$BOOST_STLPORT_PATH/stlport" /I"%include" /D "__STL_DEBUG" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" %source
+cl /Feboosttmp.exe /nologo /Zm400 /MDd /W3 /GR /GX /Zi /Od /GZ /I "$BOOST_STLPORT_PATH/stlport" /I"%include" /D "__STL_DEBUG" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" %source /link /incremental:no /libpath:$BOOST_STLPORT_PATH\lib user32.lib
 Microsoft<br>VC++<br>6.0 SP4<br>STLport<br>4.0
 
+win32
+cygwin
+GCC under cygwin
+g++ -c -ftemplate-depth-30 -I%include %source
+g++ -o boosttmp.exe -ftemplate-depth-30 -I%include %source
+GNU<br>GCC<br>2.95.2
+
+//win32
+//gcc-stlport-debug
+//GCC under cygwin with STLport 4.0
+//g++ -c -ftemplate-depth-30 -I%include -D __STL_DEBUG -I "$BOOST_STLPORT_PATH/stlport" %source
+//g++ -o boosttmp.exe -ftemplate-depth-30 "$BOOST_STLPORT_PATH/lib/" -I%include %source
+//GNU<br>GCC<br>2.95.2<br>STLport<br>4.0
+
 win32
 icl
 Intel C++ 5.0
-icl /c /nologo /Qwn5 /Zm400 /MDd /W3 /GR /GX /Zi /Od /GZ /I "%include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" %source
-icl /Feboosttmp.exe /nologo /Qwn5 /Zm400 /MDd /W3 /GR /GX /Zi /Od /GZ /I "%include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" %source /link user32.lib
+icl /c /nologo /Qwn5 /Zm400 /MDd /W3 /GR /GX /Zi /Od /GZ /I"%include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" %source
+icl /Feboosttmp.exe /nologo /Qwn5 /Zm400 /MDd /W3 /GR /GX /Zi /Od /GZ /I"%include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" %source /link user32.lib
 Intel C++<br>5.0<br>MS lib<br>6.0
 
 // end of file