diff --git a/index.html b/index.html
index d1d1ec55e..824a24fc9 100644
--- a/index.html
+++ b/index.html
@@ -208,6 +208,10 @@ toolset, click its name in the leftmost column. </p>
         href="http://developer.intel.com/software/products/kcc/">KAI
         C++</a></td>
     </tr>
+    <tr>
+        <td><a href="kylix-tools.html"><code>kylix</code></a></td>
+        <td><a href="http://www.borland.com/kylix">Borland C++ for Linux (Kylix).</a></td>
+    </tr>
     <tr>
         <td><a href="metrowerks-tools.html"><code>metrowerks</code></a></td>
         <td><a href="http://www.metrowerks.com">Metrowerks
@@ -329,8 +333,8 @@ distribution, so you can build the Boost.Jam executable yourself:</p>
 
 <ul>
     <li><a href="jam_src/readme.html#installing">Build
-        Instructions</a> are included in the
-        <a href="jam_src/readme.html">Boost.Jam documentation</a>,
+        Instructions</a> are included in the <a
+        href="jam_src/readme.html">Boost.Jam documentation</a>,
         if you need them. </li>
     <li>Your new Boost.Jam executable will be located in a newly-created
         <tt>tools/build/jam_src/bin.</tt><i>platform</i>
@@ -354,11 +358,12 @@ particularly well with this executable).</p>
 <hr>
 
 <p>Revised <!--webbot bot="Timestamp" startspan s-type="EDITED"
-s-format="%d %B, %Y" -->15 November, 2002<!--webbot bot="Timestamp"
-i-checksum="39361" endspan --> </p>
+s-format="%d %B, %Y" -->16 December, 2002<!--webbot bot="Timestamp"
+i-checksum="38515" endspan --> </p>
 
 <p>© Copyright 2001 Beman Dawes</p>
 
 <p>&nbsp;</p>
 </body>
 </html>
+
diff --git a/kylix-tools.html b/kylix-tools.html
new file mode 100644
index 000000000..dbc57d88f
--- /dev/null
+++ b/kylix-tools.html
@@ -0,0 +1,72 @@
+<html>
+
+<head>
+<meta http-equiv="Content-Type"
+content="text/html; charset=iso-8859-1">
+<meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
+<title>Boost.Build - borland toolset</title>
+<link rel="stylesheet" type="text/css" href="boost.css">
+</head>
+
+<body link="#0000FF" vlink="#800080">
+
+<table border="0" cellpadding="7" cellspacing="0" width="100%"
+summary="header">
+<tbody>    <tr>
+        <td valign="top" width="300"><h3><a
+        href="http://www.boost.org/"><img
+        src="../../c++boost.gif" alt="C++ Boost" border="0"
+        width="277" height="86"> </a></h3>
+        </td>
+        <td valign="top"><h1 align="center">Boost.Build</h1>
+        <h2 align="center">Kylix toolset</h2>
+        </td>
+    </tr>
+</tbody></table>
+
+<hr>
+
+<h2>Introduction</h2>
+
+<p>Boost.Build's <a href="http://www.borland.com/kylix">Kylix</a>
+toolset supports the <a href="http://www.borland.com/">Borland</a>
+C++ linux compiler. </p>
+
+<h2>Configuration Variables</h2>
+
+<p>The kylix toolset responds to the following variables which
+can be set in the environment or configured on the jam command-line
+using <code>-s</code><code><i>VARIABLE_NAME</i></code><code>=</code><i>value</i>:
+</p>
+
+<table border="1">
+<tbody>    <tr>
+        <th>Variable Name </th>
+        <th>Semantics </th>
+        <th>Default </th>
+        <th>Notes </th>
+    </tr>
+    <tr>
+        <td><code>KYLIX_ROOT</code> </td>
+        <td>The directory in which kylix was installed. Normally
+        this will be either /usr/local/kylix3 or ~/kylix3.</td>
+        <td>(none) </td>
+        <td>If not set the user must ensure that the environment
+        variables required by Kylix are correctly set, normally
+        this is achieved by sourcing the &quot;kylixpath&quot;
+        shell script in the Kylix bin/ directory.</td>
+    </tr>
+</tbody></table>
+
+<hr>
+
+<p>Revised <!--webbot bot="Timestamp" startspan s-type="EDITED"
+s-format="%d %B, %Y" -->16 December, 2002<!--webbot bot="Timestamp"
+i-checksum="38515" endspan --> </p>
+
+<p><i>© Copyright </i><a
+href="mailto:john_maddock@compuserve.com"><i>John Maddock</i></a><i>
+2002. All Rights Reserved.</i></p>
+</body>
+</html>
+
diff --git a/kylix-tools.jam b/kylix-tools.jam
index 36fdb45dc..e6d6269b1 100644
--- a/kylix-tools.jam
+++ b/kylix-tools.jam
@@ -7,18 +7,25 @@
 
 # The following #// line will be used by the regression test table generation
 # program as the column heading for HTML tables. Must not include version number.
-#//<a href="http://www.borland.com/bcppbuilder/freecompiler/">Kylix</a>
+#//<a href="http://www.borland.com/kylix">Kylix</a>
 
 # Borland tool definitions for Kylix.
 
-# BCCROOT is the install location of the kylix tools.
-set-as-singleton BCCROOT ;
+# KYLIX_PATH is the install location of the kylix tools.
+# This will be either /usr/local/kylix3 or ~/kylix3 depending upon install options.
+set-as-singleton KYLIX_PATH ;
 
-# compute kylix tool path
-# You can either put the kylix bin directory in your PATH, or you can set
-# BCCROOT to point at the kylix installation directory
-BCC_TOOL_PATH = $(BCCROOT)$(SLASH)bin$(SLASH) ;
-BCC_TOOL_PATH ?= "" ; # Don't clobber adjoining text if BCCROOT isn't set
+# compute kylix execution prefix
+# You can either source the "kylixpath" shell script provided by Borland
+# or set KYLIX_PATH to point to your Kylix install directory
+if $(KYLIX_PATH)
+{
+	KYLIX_EXEC_PREFIX = "source $(KYLIX_PATH)/bin/kylixpath > /dev/null && " ;
+}
+else
+{
+	KYLIX_EXEC_PREFIX = "" ;
+}
 
 # specify compilation and link flags
 flags kylix CFLAGS <debug-symbols>on : -v ;
@@ -70,16 +77,10 @@ flags kylix FINDLIBS : m ;
 flags kylix FINDLIBS : dl ;
 flags kylix CFLAGS <threading>single : -DBOOST_NO_THREADS ;
 
-#flags kylix STDHDRS : $(BCCROOT)$(SLASH)include ;  # kylix knows where to find its headers by itself. This did only confuse it.
-flags kylix STDLIBPATH : $(BCCROOT)$(SLASH)lib ;
-
 flags kylix LIBPATH <library-path> ;
 flags kylix NEEDLIBS <library-file> ;
 flags kylix FINDLIBS <find-library> ;
 
-# For detailed information about kylix tools and their command-line switches,
-# see http://www.objectcentral.com/vide/help/videdoc/bcc32.html
-
 #### Link ####
 
 rule Link-action
@@ -94,8 +95,7 @@ rule Link-action
 
 actions kylix-Link-action
 {
-    export PATH=$(BCC_TOOL_PATH):$PATH
-    "$(BCC_TOOL_PATH)bc++" -v -q $(LINKFLAGS) -L"$(LIBPATH)" -L"$(STDLIBPATH)" -o"$(<[1])" "$(>)" lib$(FINDLIBS).so
+    $(KYLIX_EXEC_PREFIX)bc++ -v -q $(LINKFLAGS) -L"$(LIBPATH)" -L"$(STDLIBPATH)" -o"$(<[1])" "$(>)" lib$(FINDLIBS).so
 }
 
 #### Cc #####
@@ -107,7 +107,7 @@ rule Cc-action
 
 actions kylix-Cc-action
 {
-    "$(BCC_TOOL_PATH)bc++" -P- -j5 -q -c -w -a8 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o"$(<)" "$(>)"
+    $(KYLIX_EXEC_PREFIX)bc++ -P- -g255 -j5 -q -c -w -a8 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o"$(<)" "$(>)"
 }
 
 #### C++ ####
@@ -120,6 +120,7 @@ rule C++-action
 # for C++ compiles the following options are turned on by default:
 #
 # -j5    stops after 5 errors
+# -g255  allow an infinite number of warnings
 # -q     no banner
 # -c     compile to object
 # -P     C++ code regardless of file extention
@@ -133,7 +134,7 @@ rule C++-action
 #
 actions kylix-C++-action
 {
-    "$(BCC_TOOL_PATH)bc++" -j5 -q -c -w -Ve -Vx -a8 -x -xd -RT -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)"  -I"$(STDHDRS)" -o"$(<)" "$(>)"
+    $(KYLIX_EXEC_PREFIX)bc++ -j5 -g255 -q -c -w -Ve -Vx -a8 -x -xd -RT -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)"  -I"$(STDHDRS)" -o"$(<)" "$(>)"
 }
 
 #### Archive ####
@@ -153,3 +154,4 @@ actions updated together piecemeal kylix-Archive-action
 
 
 
+
diff --git a/v1/index.html b/v1/index.html
index d1d1ec55e..824a24fc9 100644
--- a/v1/index.html
+++ b/v1/index.html
@@ -208,6 +208,10 @@ toolset, click its name in the leftmost column. </p>
         href="http://developer.intel.com/software/products/kcc/">KAI
         C++</a></td>
     </tr>
+    <tr>
+        <td><a href="kylix-tools.html"><code>kylix</code></a></td>
+        <td><a href="http://www.borland.com/kylix">Borland C++ for Linux (Kylix).</a></td>
+    </tr>
     <tr>
         <td><a href="metrowerks-tools.html"><code>metrowerks</code></a></td>
         <td><a href="http://www.metrowerks.com">Metrowerks
@@ -329,8 +333,8 @@ distribution, so you can build the Boost.Jam executable yourself:</p>
 
 <ul>
     <li><a href="jam_src/readme.html#installing">Build
-        Instructions</a> are included in the
-        <a href="jam_src/readme.html">Boost.Jam documentation</a>,
+        Instructions</a> are included in the <a
+        href="jam_src/readme.html">Boost.Jam documentation</a>,
         if you need them. </li>
     <li>Your new Boost.Jam executable will be located in a newly-created
         <tt>tools/build/jam_src/bin.</tt><i>platform</i>
@@ -354,11 +358,12 @@ particularly well with this executable).</p>
 <hr>
 
 <p>Revised <!--webbot bot="Timestamp" startspan s-type="EDITED"
-s-format="%d %B, %Y" -->15 November, 2002<!--webbot bot="Timestamp"
-i-checksum="39361" endspan --> </p>
+s-format="%d %B, %Y" -->16 December, 2002<!--webbot bot="Timestamp"
+i-checksum="38515" endspan --> </p>
 
 <p>© Copyright 2001 Beman Dawes</p>
 
 <p>&nbsp;</p>
 </body>
 </html>
+
diff --git a/v1/kylix-tools.html b/v1/kylix-tools.html
new file mode 100644
index 000000000..dbc57d88f
--- /dev/null
+++ b/v1/kylix-tools.html
@@ -0,0 +1,72 @@
+<html>
+
+<head>
+<meta http-equiv="Content-Type"
+content="text/html; charset=iso-8859-1">
+<meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
+<title>Boost.Build - borland toolset</title>
+<link rel="stylesheet" type="text/css" href="boost.css">
+</head>
+
+<body link="#0000FF" vlink="#800080">
+
+<table border="0" cellpadding="7" cellspacing="0" width="100%"
+summary="header">
+<tbody>    <tr>
+        <td valign="top" width="300"><h3><a
+        href="http://www.boost.org/"><img
+        src="../../c++boost.gif" alt="C++ Boost" border="0"
+        width="277" height="86"> </a></h3>
+        </td>
+        <td valign="top"><h1 align="center">Boost.Build</h1>
+        <h2 align="center">Kylix toolset</h2>
+        </td>
+    </tr>
+</tbody></table>
+
+<hr>
+
+<h2>Introduction</h2>
+
+<p>Boost.Build's <a href="http://www.borland.com/kylix">Kylix</a>
+toolset supports the <a href="http://www.borland.com/">Borland</a>
+C++ linux compiler. </p>
+
+<h2>Configuration Variables</h2>
+
+<p>The kylix toolset responds to the following variables which
+can be set in the environment or configured on the jam command-line
+using <code>-s</code><code><i>VARIABLE_NAME</i></code><code>=</code><i>value</i>:
+</p>
+
+<table border="1">
+<tbody>    <tr>
+        <th>Variable Name </th>
+        <th>Semantics </th>
+        <th>Default </th>
+        <th>Notes </th>
+    </tr>
+    <tr>
+        <td><code>KYLIX_ROOT</code> </td>
+        <td>The directory in which kylix was installed. Normally
+        this will be either /usr/local/kylix3 or ~/kylix3.</td>
+        <td>(none) </td>
+        <td>If not set the user must ensure that the environment
+        variables required by Kylix are correctly set, normally
+        this is achieved by sourcing the &quot;kylixpath&quot;
+        shell script in the Kylix bin/ directory.</td>
+    </tr>
+</tbody></table>
+
+<hr>
+
+<p>Revised <!--webbot bot="Timestamp" startspan s-type="EDITED"
+s-format="%d %B, %Y" -->16 December, 2002<!--webbot bot="Timestamp"
+i-checksum="38515" endspan --> </p>
+
+<p><i>© Copyright </i><a
+href="mailto:john_maddock@compuserve.com"><i>John Maddock</i></a><i>
+2002. All Rights Reserved.</i></p>
+</body>
+</html>
+
diff --git a/v1/kylix-tools.jam b/v1/kylix-tools.jam
index 36fdb45dc..e6d6269b1 100644
--- a/v1/kylix-tools.jam
+++ b/v1/kylix-tools.jam
@@ -7,18 +7,25 @@
 
 # The following #// line will be used by the regression test table generation
 # program as the column heading for HTML tables. Must not include version number.
-#//<a href="http://www.borland.com/bcppbuilder/freecompiler/">Kylix</a>
+#//<a href="http://www.borland.com/kylix">Kylix</a>
 
 # Borland tool definitions for Kylix.
 
-# BCCROOT is the install location of the kylix tools.
-set-as-singleton BCCROOT ;
+# KYLIX_PATH is the install location of the kylix tools.
+# This will be either /usr/local/kylix3 or ~/kylix3 depending upon install options.
+set-as-singleton KYLIX_PATH ;
 
-# compute kylix tool path
-# You can either put the kylix bin directory in your PATH, or you can set
-# BCCROOT to point at the kylix installation directory
-BCC_TOOL_PATH = $(BCCROOT)$(SLASH)bin$(SLASH) ;
-BCC_TOOL_PATH ?= "" ; # Don't clobber adjoining text if BCCROOT isn't set
+# compute kylix execution prefix
+# You can either source the "kylixpath" shell script provided by Borland
+# or set KYLIX_PATH to point to your Kylix install directory
+if $(KYLIX_PATH)
+{
+	KYLIX_EXEC_PREFIX = "source $(KYLIX_PATH)/bin/kylixpath > /dev/null && " ;
+}
+else
+{
+	KYLIX_EXEC_PREFIX = "" ;
+}
 
 # specify compilation and link flags
 flags kylix CFLAGS <debug-symbols>on : -v ;
@@ -70,16 +77,10 @@ flags kylix FINDLIBS : m ;
 flags kylix FINDLIBS : dl ;
 flags kylix CFLAGS <threading>single : -DBOOST_NO_THREADS ;
 
-#flags kylix STDHDRS : $(BCCROOT)$(SLASH)include ;  # kylix knows where to find its headers by itself. This did only confuse it.
-flags kylix STDLIBPATH : $(BCCROOT)$(SLASH)lib ;
-
 flags kylix LIBPATH <library-path> ;
 flags kylix NEEDLIBS <library-file> ;
 flags kylix FINDLIBS <find-library> ;
 
-# For detailed information about kylix tools and their command-line switches,
-# see http://www.objectcentral.com/vide/help/videdoc/bcc32.html
-
 #### Link ####
 
 rule Link-action
@@ -94,8 +95,7 @@ rule Link-action
 
 actions kylix-Link-action
 {
-    export PATH=$(BCC_TOOL_PATH):$PATH
-    "$(BCC_TOOL_PATH)bc++" -v -q $(LINKFLAGS) -L"$(LIBPATH)" -L"$(STDLIBPATH)" -o"$(<[1])" "$(>)" lib$(FINDLIBS).so
+    $(KYLIX_EXEC_PREFIX)bc++ -v -q $(LINKFLAGS) -L"$(LIBPATH)" -L"$(STDLIBPATH)" -o"$(<[1])" "$(>)" lib$(FINDLIBS).so
 }
 
 #### Cc #####
@@ -107,7 +107,7 @@ rule Cc-action
 
 actions kylix-Cc-action
 {
-    "$(BCC_TOOL_PATH)bc++" -P- -j5 -q -c -w -a8 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o"$(<)" "$(>)"
+    $(KYLIX_EXEC_PREFIX)bc++ -P- -g255 -j5 -q -c -w -a8 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o"$(<)" "$(>)"
 }
 
 #### C++ ####
@@ -120,6 +120,7 @@ rule C++-action
 # for C++ compiles the following options are turned on by default:
 #
 # -j5    stops after 5 errors
+# -g255  allow an infinite number of warnings
 # -q     no banner
 # -c     compile to object
 # -P     C++ code regardless of file extention
@@ -133,7 +134,7 @@ rule C++-action
 #
 actions kylix-C++-action
 {
-    "$(BCC_TOOL_PATH)bc++" -j5 -q -c -w -Ve -Vx -a8 -x -xd -RT -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)"  -I"$(STDHDRS)" -o"$(<)" "$(>)"
+    $(KYLIX_EXEC_PREFIX)bc++ -j5 -g255 -q -c -w -Ve -Vx -a8 -x -xd -RT -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)"  -I"$(STDHDRS)" -o"$(<)" "$(>)"
 }
 
 #### Archive ####
@@ -153,3 +154,4 @@ actions updated together piecemeal kylix-Archive-action
 
 
 
+
