diff --git a/src/engine/Jambase b/src/engine/Jambase
index 4e8a73fea..4fda6695c 100644
--- a/src/engine/Jambase
+++ b/src/engine/Jambase
@@ -7,11 +7,10 @@
 #
 
 # This file is ALSO:
-# (C) Copyright David Abrahams 2001. Permission to copy, use,
-# modify, sell and distribute this software is granted provided this
-# copyright notice appears in all copies. This software is provided
-# "as is" without express or implied warranty, and with no claim as
-# to its suitability for any purpose.
+# Copyright 2001-2004 David Abrahams.
+# Copyright 2002-2004 Rene Rivera.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 
 if $(NT)
 {
diff --git a/src/engine/boost-jam.spec b/src/engine/boost-jam.spec
index 189eb4631..e813e8327 100644
--- a/src/engine/boost-jam.spec
+++ b/src/engine/boost-jam.spec
@@ -1,10 +1,10 @@
 Name: boost-jam
-Version: 3.1.9
+Version: 3.1.10
 Summary: Build tool
 Release: 1
 Source: %{name}-%{version}.tgz
 
-License: Boost Software License
+License: Boost Software License, Version 1.0
 Group: Development/Tools
 URL: http://www.boost.org
 Packager: Rene Rivera <grafik@redshift-software.com>
@@ -31,11 +31,11 @@ Copyright:
     ALL WARRANTIES ARE HEREBY DISCLAIMED.
 
 Also:
-    Copyright (C) David Abrahams 2001-2003.
+    Copyright 2001-2004 David Abrahams.
+    Copyright 2002-2004 Rene Rivera.
     
-    Use, modification and distribution is subject to the
-    Boost Software License, Version 1.0. (See accompanying file
-    LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+    Distributed under the Boost Software License, Version 1.0.
+    (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 
 %prep
 %setup -n %{name}-%{version}
diff --git a/src/engine/build.bat b/src/engine/build.bat
index 87e70e743..118e3de59 100644
--- a/src/engine/build.bat
+++ b/src/engine/build.bat
@@ -1,9 +1,8 @@
 @ECHO OFF
 
-REM ~ Copyright (C) Rene Rivera, 2002-2003.
-REM ~ Use, modification and distribution is subject to the
-REM ~ Boost Software License, Version 1.0. (See accompanying file
-REM ~ LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+REM ~ Copyright 2002-2003 Rene Rivera.
+REM ~ Distributed under the Boost Software License, Version 1.0.
+REM ~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 
 setlocal
 goto Start
diff --git a/src/engine/build.jam b/src/engine/build.jam
index 3a8462e04..58f8200db 100644
--- a/src/engine/build.jam
+++ b/src/engine/build.jam
@@ -1,7 +1,6 @@
-#~ Copyright (C) Rene Rivera, 2002-2003.
-#~ Use, modification and distribution is subject to the
-#~ Boost Software License, Version 1.0. (See accompanying file
-#~ LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+#~ Copyright 2002-2004 Rene Rivera.
+#~ Distributed under the Boost Software License, Version 1.0.
+#~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 
 # Platform related specifics.
 if $(NT) { rule .path { return "$(<:J=\\)" ; } }
@@ -14,7 +13,7 @@ else { . = "." ; }
 
 # Info about what we are building.
 NAME = boost-jam ;
-VERSION = 3$(.)1$(.)9 ;
+VERSION = 3$(.)1$(.)10 ;
 RELEASE = 1 ;
 LICENSE = 1_0 ;
 
@@ -405,16 +404,16 @@ rule .exe
     return $(exe) ;
 }
 if ! $(--def[2]) { actions .cc. {
-    $(--cc) $(--bin)$(<:D=) $(--dir)$(<:D) $(--out)$(<) $(--def)$(--defs) $(--flags) "$(--libs)" $(>)
+    "$(--cc)" $(--bin)$(<:D=) $(--dir)$(<:D) $(--out)$(<) $(--def)$(--defs) $(--flags) "$(--libs)" $(>)
 } }
 else { actions .cc. {
-    $(--cc) $(--bin)$(<:D=) $(--dir)$(<:D) $(--out)$(<) $(--def[1])$(--defs:J=$(--def[2]))$(--def[3]) $(--flags) "$(--libs)" $(>)
+    "$(--cc)" $(--bin)$(<:D=) $(--dir)$(<:D) $(--out)$(<) $(--def[1])$(--defs:J=$(--def[2]))$(--def[3]) $(--flags) "$(--libs)" $(>)
 } }
 if $(VMS) { actions .ld. {
-    $(--link) $(--link-bin)$(<:D=) $(--link-dir)$(<:D) $(--link-out)$(<) $(--link-def)$(--link-defs) $(--link-flags) "$(--link-libs)" $(>J=", ")
+    "$(--link)" $(--link-bin)$(<:D=) $(--link-dir)$(<:D) $(--link-out)$(<) $(--link-def)$(--link-defs) $(--link-flags) "$(--link-libs)" $(>J=", ")
 } }
 else { actions .ld. {
-    $(--link) $(--link-bin)$(<:D=) $(--link-dir)$(<:D) $(--link-out)$(<) $(--link-def)$(--link-defs) $(--link-flags) "$(--link-libs)" $(>)
+    "$(--link)" $(--link-bin)$(<:D=) $(--link-dir)$(<:D) $(--link-out)$(<) $(--link-def)$(--link-defs) $(--link-flags) "$(--link-libs)" $(>)
 } }
 
 rule .link
@@ -463,7 +462,7 @@ rule .yyacc
 actions .yyacc. {
     $(--chmod+w)$(<[1])
     $(--chmod+w)$(<[2])
-    $(yyacc.exe) $(<) $(>)
+    "$(yyacc.exe)" $(<) $(>)
 }
 if $(grammar)
 {
@@ -582,7 +581,10 @@ rule .hdr.scan
 
 # Distribution making from here on out.
 dist.license =
-    [ GLOB . : LICENSE_$(LICENSE).txt ] [ GLOB [ .path .. .. .. ] : LICENSE_$(LICENSE).txt ] ;
+    #~ [ GLOB . : LICENSE_$(LICENSE).txt ] [ GLOB [ .path .. .. .. ] : LICENSE_$(LICENSE).txt ] ;
+    [ GLOB . : LICENSE_$(LICENSE).txt ]
+    [ GLOB [ .path .. .. .. ] : LICENSE_$(LICENSE).txt ]
+    [ GLOB [ .path .. boost ] : LICENSE_$(LICENSE).txt ] ;
 dist.docs =
     $(dist.license[1])
     index.html
@@ -611,9 +613,10 @@ dist.source = $(dist.source:D=)
     boost-jam.spec
     ;
 dist.bin =
-    bjam jam mkjambase yyacc
+    bjam
     ;
 dist.bin =
+    $(dist.license[1])
     $(dist.bin:S=$(bjam.exe:S))
     ;
 
@@ -669,21 +672,13 @@ rule .binary
 # Package some file.
 rule .package ( dst-dir : src-files + )
 {
-    local src-dirs ;
     local dst-files ;
-    local dst-dirs ;
     for local src-path in $(src-files)
     {
-        local src-dir = $(src-path:D) ;
-        if ! $(src-dir) in $(src-dirs) &&
-            ! $(src-dir) = "" &&
-            ! $(src-dir:D=) != ".."
-        {
-            src-dirs += $(src-dir) ;
-            dst-dirs += $(src-dir:R=$(dst-dir)) ;
-        }
+        local src-subdir = $(src-path:D) ;
         local src-file = $(src-path) ;
-        if $(src-dir:D=) = ".."
+        while $(src-subdir:D) { src-subdir = $(src-subdir:D) ; }
+        if $(src-subdir) = ".."
         {
             src-file = $(src-file:D=) ;
         }
@@ -697,15 +692,11 @@ rule .package ( dst-dir : src-files + )
     DEPENDS dist : $(pack) ;
     DEPENDS $(pack) : $(dst-files) ;
     
+    local dst-files-queue = $(dst-files) ;
     for local src-path in $(src-files)
     {
-        local src-dir = $(src-path:D) ;
-        local src-file = $(src-path) ;
-        if $(src-dir:D=) = ".."
-        {
-            src-file = $(src-file:D=) ;
-        }
-        local dst-file = $(src-file:R=$(dst-dir)) ;
+        local dst-file = $(dst-files-queue[1]) ;
+        dst-files-queue = $(dst-files-queue[2-]) ;
         DEPENDS $(dst-file) : $(src-path) $(dst-file:D) ;
         .mkdir $(dst-file:D) ;
         
@@ -757,7 +748,7 @@ actions .rpm. {
 # distribution build not requested.
 if dist in $(ARGV)
 {
-    .binary bjam ;
+    #~ .binary bjam ;
     .package $(NAME)-$(VERSION) : $(dist.source) ;
     .package $(NAME)-$(VERSION)-$(RELEASE)-$(platform) : $(dist.bin) ;
     if $(rpm-tool)
diff --git a/src/engine/build.sh b/src/engine/build.sh
index d943b87d4..abcbea948 100755
--- a/src/engine/build.sh
+++ b/src/engine/build.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
-#~ Copyright (C) Rene Rivera, 2002-2003.
-#~ Use, modification and distribution is subject to the
-#~ Boost Software License, Version 1.0. (See accompanying file
-#~ LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+#~ Copyright 2002-2003 Rene Rivera.
+#~ Distributed under the Boost Software License, Version 1.0.
+#~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 
 # Reset the toolset.
 BOOST_JAM_TOOLSET=
diff --git a/src/engine/build_vms.com b/src/engine/build_vms.com
index 50570cbec..dc014cf3b 100644
--- a/src/engine/build_vms.com
+++ b/src/engine/build_vms.com
@@ -1,8 +1,6 @@
-$ ! Copyright (C) Rene Rivera, Johan Nilsson, 2002-2003.
-$ ! 
-$ ! Use, modification and distribution is subject to the
-$ ! Boost Software License, Version 1.0. (See accompanying file
-$ ! LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+$ ! Copyright 2002-2003 Rene Rivera, Johan Nilsson.
+$ ! Distributed under the Boost Software License, Version 1.0.
+$ ! (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 $ ! 
 $ ! bootstrap build script for Jam
 $ ! 
diff --git a/src/engine/command.c b/src/engine/command.c
index e6f190db5..bcb7fcbc9 100644
--- a/src/engine/command.c
+++ b/src/engine/command.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 /*
diff --git a/src/engine/compile.c b/src/engine/compile.c
index a26bc8928..ed99f5564 100644
--- a/src/engine/compile.c
+++ b/src/engine/compile.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/compile.h b/src/engine/compile.h
index c622231db..eb548bde3 100644
--- a/src/engine/compile.h
+++ b/src/engine/compile.h
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 #ifndef COMPILE_DWA20011022_H
diff --git a/src/engine/debian/copyright b/src/engine/debian/copyright
index e0285a3e2..9dd83c7cc 100644
--- a/src/engine/debian/copyright
+++ b/src/engine/debian/copyright
@@ -17,8 +17,8 @@ Copyright:
 
 Some portions are also:
 
-    (C) Copyright David Abrahams 2001. Permission to copy, use,
-    modify, sell and distribute this software is granted provided this
-    copyright notice appears in all copies. This software is provided
-    "as is" without express or implied warranty, and with no claim as
-    to its suitability for any purpose.
+    Copyright 2001-2004 David Abrahams.
+    Copyright 2002-2004 Rene Rivera.
+    
+    Distributed under the Boost Software License, Version 1.0.
+    (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
diff --git a/src/engine/execnt.c b/src/engine/execnt.c
index 0914ae53b..5c626fe5d 100644
--- a/src/engine/execnt.c
+++ b/src/engine/execnt.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/filemac.c b/src/engine/filemac.c
index a14bf83d6..691c4093d 100644
--- a/src/engine/filemac.c
+++ b/src/engine/filemac.c
@@ -5,11 +5,9 @@
  */
  
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/filent.c b/src/engine/filent.c
index 28c220287..b4efad201 100644
--- a/src/engine/filent.c
+++ b/src/engine/filent.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/fileos2.c b/src/engine/fileos2.c
index 6fe70b5ef..2821a4c2a 100644
--- a/src/engine/fileos2.c
+++ b/src/engine/fileos2.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/filesys.h b/src/engine/filesys.h
index 44b4021dc..2ba9a8bc3 100644
--- a/src/engine/filesys.h
+++ b/src/engine/filesys.h
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 /*
diff --git a/src/engine/fileunix.c b/src/engine/fileunix.c
index a2b9bbf19..05ef415a6 100644
--- a/src/engine/fileunix.c
+++ b/src/engine/fileunix.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/filevms.c b/src/engine/filevms.c
index 82b98b4cf..ce2d9031c 100644
--- a/src/engine/filevms.c
+++ b/src/engine/filevms.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/frames.c b/src/engine/frames.c
index 5e8e45a6f..c1bc1a03a 100644
--- a/src/engine/frames.c
+++ b/src/engine/frames.c
@@ -1,9 +1,7 @@
 /*  
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "frames.h"
diff --git a/src/engine/frames.h b/src/engine/frames.h
index 8541af1c0..c170923fd 100644
--- a/src/engine/frames.h
+++ b/src/engine/frames.h
@@ -1,9 +1,7 @@
 /*  
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 #ifndef FRAMES_DWA20011021_H
 # define FRAMES_DWA20011021_H
diff --git a/src/engine/hdrmacro.c b/src/engine/hdrmacro.c
index d9abbe56b..486039a1e 100644
--- a/src/engine/hdrmacro.c
+++ b/src/engine/hdrmacro.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/headers.c b/src/engine/headers.c
index 53ee402e9..e8faf797d 100644
--- a/src/engine/headers.c
+++ b/src/engine/headers.c
@@ -4,11 +4,9 @@
  * This file is part of Jam - see jam.c for Copyright information.
  */
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/index.html b/src/engine/index.html
index 9840ebb00..fca5ce1b2 100644
--- a/src/engine/index.html
+++ b/src/engine/index.html
@@ -134,7 +134,7 @@
   facilitate its use in the Boost Build System, but should be backward
   compatible with Perforce Jam.</p>
 
-  <p>This is version 3.1.9 of BJam and is based on version 2.4 of Jam/MR:</p>
+  <p>This is version 3.1.10 of BJam and is based on version 2.4 of Jam/MR:</p>
   <pre>
 /+\
 +\  Copyright 1993-2002 Christopher Seiwald and Perforce Software, Inc.
@@ -1211,10 +1211,10 @@ if $(MESSAGE) { ECHO The message is: $(MESSAGE) ; }
    18 November, 2003 
   <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
 
-  <p>Copyright Rene Rivera, David Abrahams, Vladimir Prus 2003.</p>
+  <p>Copyright 2003-2004 Rene Rivera, David Abrahams, Vladimir Prus.</p>
 
-  <p>Use, modification and distribution is subject to the Boost Software
-  License, Version 1.0. (See accompanying file LICENSE_1_0.txt or <a href=
-  "http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt)</a></p>
+  <p>Distributed under the Boost Software License, Version 1.0.
+  (See accompanying file LICENSE_1_0.txt or <a href="http://www.boost.org/LICENSE_1_0.txt">
+  http://www.boost.org/LICENSE_1_0.txt)</a></p>
 </body>
 </html>
diff --git a/src/engine/jam.c b/src/engine/jam.c
index 6f1cbae18..3598ef74f 100644
--- a/src/engine/jam.c
+++ b/src/engine/jam.c
@@ -13,11 +13,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 /*
@@ -245,7 +243,8 @@ int  main( int argc, char **argv, char **arg_environ )
         printf( "Version %s. %s.\n", VERSION, OSMINOR );
 	   printf( "   Copyright 1993-2002 Christopher Seiwald and Perforce Software, Inc.  \n" );
         printf( "   Copyright 2001 David Turner.\n" );
-        printf( "   Copyright 2001-2002 David Abrahams.\n" );
+        printf( "   Copyright 2001-2004 David Abrahams.\n" );
+        printf( "   Copyright 2002-2004 Rene Rivera.\n" );
 
         return EXITOK;
     }
@@ -323,7 +322,7 @@ int  main( int argc, char **argv, char **arg_environ )
     {
    /* Pleace don't change the following line. The 'bump_version.py' script
        expect a specific format of it. */
-    char  *major_version = "03", *minor_version = "01", *changenum = "09";
+    char  *major_version = "03", *minor_version = "01", *changenum = "10";
     var_set( "JAM_VERSION",
              list_new( list_new( list_new( L0, newstr( major_version ) ), 
                                  newstr( minor_version ) ), 
diff --git a/src/engine/jam.h b/src/engine/jam.h
index d3c39a3f6..18bfa4709 100644
--- a/src/engine/jam.h
+++ b/src/engine/jam.h
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001-2002. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 /*
diff --git a/src/engine/jamgram.c b/src/engine/jamgram.c
index bd2449599..26e0460b5 100644
--- a/src/engine/jamgram.c
+++ b/src/engine/jamgram.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875a.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -152,7 +152,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 98 "jamgram.y"
+#line 96 "jamgram.y"
 
 #include "jam.h"
 
@@ -220,7 +220,7 @@ typedef int YYSTYPE;
 
 
 /* Line 214 of yacc.c.  */
-#line 224 "y.tab.c"
+#line 223 "y.tab.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
@@ -422,14 +422,14 @@ static const yysigned_char yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short yyrline[] =
 {
-       0,   141,   141,   143,   154,   156,   160,   162,   164,   169,
-     172,   174,   178,   181,   184,   187,   190,   192,   194,   196,
-     198,   200,   202,   204,   206,   208,   210,   212,   214,   216,
-     218,   221,   223,   220,   232,   234,   236,   238,   245,   247,
-     249,   251,   253,   255,   257,   259,   261,   263,   265,   267,
-     269,   271,   283,   284,   288,   297,   299,   309,   314,   315,
-     319,   321,   321,   330,   332,   334,   345,   346,   350,   352,
-     354,   356,   358,   360,   370,   371
+       0,   139,   139,   141,   152,   154,   158,   160,   162,   167,
+     170,   172,   176,   179,   182,   185,   188,   190,   192,   194,
+     196,   198,   200,   202,   204,   206,   208,   210,   212,   214,
+     216,   219,   221,   218,   230,   232,   234,   236,   243,   245,
+     247,   249,   251,   253,   255,   257,   259,   261,   263,   265,
+     267,   269,   281,   282,   286,   295,   297,   307,   312,   313,
+     317,   319,   319,   328,   330,   332,   343,   344,   348,   350,
+     352,   354,   356,   358,   368,   369
 };
 #endif
 
@@ -668,7 +668,6 @@ static const unsigned char yystos[] =
 #define YYABORT		goto yyabortlab
 #define YYERROR		goto yyerrlab1
 
-
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
@@ -1251,375 +1250,375 @@ yyreduce:
   switch (yyn)
     {
         case 3:
-#line 144 "jamgram.y"
+#line 142 "jamgram.y"
     { parse_save( yyvsp[0].parse ); }
     break;
 
   case 4:
-#line 155 "jamgram.y"
+#line 153 "jamgram.y"
     { yyval.parse = yyvsp[0].parse; }
     break;
 
   case 5:
-#line 157 "jamgram.y"
+#line 155 "jamgram.y"
     { yyval.parse = yyvsp[0].parse; }
     break;
 
   case 6:
-#line 161 "jamgram.y"
+#line 159 "jamgram.y"
     { yyval.parse = yyvsp[0].parse; }
     break;
 
   case 7:
-#line 163 "jamgram.y"
+#line 161 "jamgram.y"
     { yyval.parse = prules( yyvsp[-1].parse, yyvsp[0].parse ); }
     break;
 
   case 8:
-#line 165 "jamgram.y"
+#line 163 "jamgram.y"
     { yyval.parse = plocal( yyvsp[-3].parse, yyvsp[-2].parse, yyvsp[0].parse ); }
     break;
 
   case 9:
-#line 169 "jamgram.y"
+#line 167 "jamgram.y"
     { yyval.parse = pnull(); }
     break;
 
   case 10:
-#line 173 "jamgram.y"
+#line 171 "jamgram.y"
     { yyval.parse = yyvsp[0].parse; yyval.number = ASSIGN_SET; }
     break;
 
   case 11:
-#line 175 "jamgram.y"
+#line 173 "jamgram.y"
     { yyval.parse = yyvsp[0].parse; yyval.number = ASSIGN_APPEND; }
     break;
 
   case 12:
-#line 179 "jamgram.y"
+#line 177 "jamgram.y"
     { yyval.parse = yyvsp[-1].parse; }
     break;
 
   case 13:
-#line 181 "jamgram.y"
+#line 179 "jamgram.y"
     { yyval.parse = P0; }
     break;
 
   case 14:
-#line 185 "jamgram.y"
+#line 183 "jamgram.y"
     { yyval.number = 1; }
     break;
 
   case 15:
-#line 187 "jamgram.y"
+#line 185 "jamgram.y"
     { yyval.number = 0; }
     break;
 
   case 16:
-#line 191 "jamgram.y"
+#line 189 "jamgram.y"
     { yyval.parse = yyvsp[-1].parse; }
     break;
 
   case 17:
-#line 193 "jamgram.y"
+#line 191 "jamgram.y"
     { yyval.parse = pincl( yyvsp[-1].parse ); }
     break;
 
   case 18:
-#line 195 "jamgram.y"
+#line 193 "jamgram.y"
     { yyval.parse = prule( yyvsp[-2].string, yyvsp[-1].parse ); }
     break;
 
   case 19:
-#line 197 "jamgram.y"
+#line 195 "jamgram.y"
     { yyval.parse = pset( yyvsp[-3].parse, yyvsp[-1].parse, yyvsp[-2].number ); }
     break;
 
   case 20:
-#line 199 "jamgram.y"
+#line 197 "jamgram.y"
     { yyval.parse = pset1( yyvsp[-5].parse, yyvsp[-3].parse, yyvsp[-1].parse, yyvsp[-2].number ); }
     break;
 
   case 21:
-#line 201 "jamgram.y"
+#line 199 "jamgram.y"
     { yyval.parse = yyvsp[-1].parse; }
     break;
 
   case 22:
-#line 203 "jamgram.y"
+#line 201 "jamgram.y"
     { yyval.parse = pfor( yyvsp[-5].string, yyvsp[-3].parse, yyvsp[-1].parse, yyvsp[-6].number ); }
     break;
 
   case 23:
-#line 205 "jamgram.y"
+#line 203 "jamgram.y"
     { yyval.parse = pswitch( yyvsp[-3].parse, yyvsp[-1].parse ); }
     break;
 
   case 24:
-#line 207 "jamgram.y"
+#line 205 "jamgram.y"
     { yyval.parse = pif( yyvsp[-3].parse, yyvsp[-1].parse, pnull() ); }
     break;
 
   case 25:
-#line 209 "jamgram.y"
+#line 207 "jamgram.y"
     { yyval.parse = pmodule( yyvsp[-3].parse, yyvsp[-1].parse ); }
     break;
 
   case 26:
-#line 211 "jamgram.y"
+#line 209 "jamgram.y"
     { yyval.parse = pclass( yyvsp[-3].parse, yyvsp[-1].parse ); }
     break;
 
   case 27:
-#line 213 "jamgram.y"
+#line 211 "jamgram.y"
     { yyval.parse = pwhile( yyvsp[-3].parse, yyvsp[-1].parse ); }
     break;
 
   case 28:
-#line 215 "jamgram.y"
+#line 213 "jamgram.y"
     { yyval.parse = pif( yyvsp[-5].parse, yyvsp[-3].parse, yyvsp[0].parse ); }
     break;
 
   case 29:
-#line 217 "jamgram.y"
+#line 215 "jamgram.y"
     { yyval.parse = psetc( yyvsp[-2].string, yyvsp[0].parse, yyvsp[-1].parse, yyvsp[-4].number ); }
     break;
 
   case 30:
-#line 219 "jamgram.y"
+#line 217 "jamgram.y"
     { yyval.parse = pon( yyvsp[-1].parse, yyvsp[0].parse ); }
     break;
 
   case 31:
-#line 221 "jamgram.y"
+#line 219 "jamgram.y"
     { yymode( SCAN_STRING ); }
     break;
 
   case 32:
-#line 223 "jamgram.y"
+#line 221 "jamgram.y"
     { yymode( SCAN_NORMAL ); }
     break;
 
   case 33:
-#line 225 "jamgram.y"
+#line 223 "jamgram.y"
     { yyval.parse = psete( yyvsp[-6].string,yyvsp[-5].parse,yyvsp[-2].string,yyvsp[-7].number ); }
     break;
 
   case 34:
-#line 233 "jamgram.y"
+#line 231 "jamgram.y"
     { yyval.number = ASSIGN_SET; }
     break;
 
   case 35:
-#line 235 "jamgram.y"
+#line 233 "jamgram.y"
     { yyval.number = ASSIGN_APPEND; }
     break;
 
   case 36:
-#line 237 "jamgram.y"
+#line 235 "jamgram.y"
     { yyval.number = ASSIGN_DEFAULT; }
     break;
 
   case 37:
-#line 239 "jamgram.y"
+#line 237 "jamgram.y"
     { yyval.number = ASSIGN_DEFAULT; }
     break;
 
   case 38:
-#line 246 "jamgram.y"
+#line 244 "jamgram.y"
     { yyval.parse = peval( EXPR_EXISTS, yyvsp[0].parse, pnull() ); }
     break;
 
   case 39:
-#line 248 "jamgram.y"
+#line 246 "jamgram.y"
     { yyval.parse = peval( EXPR_EQUALS, yyvsp[-2].parse, yyvsp[0].parse ); }
     break;
 
   case 40:
-#line 250 "jamgram.y"
+#line 248 "jamgram.y"
     { yyval.parse = peval( EXPR_NOTEQ, yyvsp[-2].parse, yyvsp[0].parse ); }
     break;
 
   case 41:
-#line 252 "jamgram.y"
+#line 250 "jamgram.y"
     { yyval.parse = peval( EXPR_LESS, yyvsp[-2].parse, yyvsp[0].parse ); }
     break;
 
   case 42:
-#line 254 "jamgram.y"
+#line 252 "jamgram.y"
     { yyval.parse = peval( EXPR_LESSEQ, yyvsp[-2].parse, yyvsp[0].parse ); }
     break;
 
   case 43:
-#line 256 "jamgram.y"
+#line 254 "jamgram.y"
     { yyval.parse = peval( EXPR_MORE, yyvsp[-2].parse, yyvsp[0].parse ); }
     break;
 
   case 44:
-#line 258 "jamgram.y"
+#line 256 "jamgram.y"
     { yyval.parse = peval( EXPR_MOREEQ, yyvsp[-2].parse, yyvsp[0].parse ); }
     break;
 
   case 45:
-#line 260 "jamgram.y"
+#line 258 "jamgram.y"
     { yyval.parse = peval( EXPR_AND, yyvsp[-2].parse, yyvsp[0].parse ); }
     break;
 
   case 46:
-#line 262 "jamgram.y"
+#line 260 "jamgram.y"
     { yyval.parse = peval( EXPR_AND, yyvsp[-2].parse, yyvsp[0].parse ); }
     break;
 
   case 47:
-#line 264 "jamgram.y"
+#line 262 "jamgram.y"
     { yyval.parse = peval( EXPR_OR, yyvsp[-2].parse, yyvsp[0].parse ); }
     break;
 
   case 48:
-#line 266 "jamgram.y"
+#line 264 "jamgram.y"
     { yyval.parse = peval( EXPR_OR, yyvsp[-2].parse, yyvsp[0].parse ); }
     break;
 
   case 49:
-#line 268 "jamgram.y"
+#line 266 "jamgram.y"
     { yyval.parse = peval( EXPR_IN, yyvsp[-2].parse, yyvsp[0].parse ); }
     break;
 
   case 50:
-#line 270 "jamgram.y"
+#line 268 "jamgram.y"
     { yyval.parse = peval( EXPR_NOT, yyvsp[0].parse, pnull() ); }
     break;
 
   case 51:
-#line 272 "jamgram.y"
+#line 270 "jamgram.y"
     { yyval.parse = yyvsp[-1].parse; }
     break;
 
   case 52:
-#line 283 "jamgram.y"
+#line 281 "jamgram.y"
     { yyval.parse = P0; }
     break;
 
   case 53:
-#line 285 "jamgram.y"
+#line 283 "jamgram.y"
     { yyval.parse = pnode( yyvsp[-1].parse, yyvsp[0].parse ); }
     break;
 
   case 54:
-#line 289 "jamgram.y"
+#line 287 "jamgram.y"
     { yyval.parse = psnode( yyvsp[-2].string, yyvsp[0].parse ); }
     break;
 
   case 55:
-#line 298 "jamgram.y"
+#line 296 "jamgram.y"
     { yyval.parse = pnode( P0, yyvsp[0].parse ); }
     break;
 
   case 56:
-#line 300 "jamgram.y"
+#line 298 "jamgram.y"
     { yyval.parse = pnode( yyvsp[0].parse, yyvsp[-2].parse ); }
     break;
 
   case 57:
-#line 310 "jamgram.y"
+#line 308 "jamgram.y"
     { yyval.parse = yyvsp[0].parse; yymode( SCAN_NORMAL ); }
     break;
 
   case 58:
-#line 314 "jamgram.y"
+#line 312 "jamgram.y"
     { yyval.parse = pnull(); yymode( SCAN_PUNCT ); }
     break;
 
   case 59:
-#line 316 "jamgram.y"
+#line 314 "jamgram.y"
     { yyval.parse = pappend( yyvsp[-1].parse, yyvsp[0].parse ); }
     break;
 
   case 60:
-#line 320 "jamgram.y"
+#line 318 "jamgram.y"
     { yyval.parse = plist( yyvsp[0].string ); }
     break;
 
   case 61:
-#line 321 "jamgram.y"
+#line 319 "jamgram.y"
     { yymode( SCAN_NORMAL ); }
     break;
 
   case 62:
-#line 322 "jamgram.y"
+#line 320 "jamgram.y"
     { yyval.parse = yyvsp[-1].parse; }
     break;
 
   case 63:
-#line 331 "jamgram.y"
+#line 329 "jamgram.y"
     { yyval.parse = prule( yyvsp[-1].string, yyvsp[0].parse ); }
     break;
 
   case 64:
-#line 333 "jamgram.y"
+#line 331 "jamgram.y"
     { yyval.parse = pon( yyvsp[-2].parse, prule( yyvsp[-1].string, yyvsp[0].parse ) ); }
     break;
 
   case 65:
-#line 335 "jamgram.y"
+#line 333 "jamgram.y"
     { yyval.parse = pon( yyvsp[-2].parse, yyvsp[0].parse ); }
     break;
 
   case 66:
-#line 345 "jamgram.y"
+#line 343 "jamgram.y"
     { yyval.number = 0; }
     break;
 
   case 67:
-#line 347 "jamgram.y"
+#line 345 "jamgram.y"
     { yyval.number = yyvsp[-1].number | yyvsp[0].number; }
     break;
 
   case 68:
-#line 351 "jamgram.y"
+#line 349 "jamgram.y"
     { yyval.number = EXEC_UPDATED; }
     break;
 
   case 69:
-#line 353 "jamgram.y"
+#line 351 "jamgram.y"
     { yyval.number = EXEC_TOGETHER; }
     break;
 
   case 70:
-#line 355 "jamgram.y"
+#line 353 "jamgram.y"
     { yyval.number = EXEC_IGNORE; }
     break;
 
   case 71:
-#line 357 "jamgram.y"
+#line 355 "jamgram.y"
     { yyval.number = EXEC_QUIETLY; }
     break;
 
   case 72:
-#line 359 "jamgram.y"
+#line 357 "jamgram.y"
     { yyval.number = EXEC_PIECEMEAL; }
     break;
 
   case 73:
-#line 361 "jamgram.y"
+#line 359 "jamgram.y"
     { yyval.number = EXEC_EXISTING; }
     break;
 
   case 74:
-#line 370 "jamgram.y"
+#line 368 "jamgram.y"
     { yyval.parse = pnull(); }
     break;
 
   case 75:
-#line 372 "jamgram.y"
+#line 370 "jamgram.y"
     { yyval.parse = yyvsp[0].parse; }
     break;
 
 
     }
 
-/* Line 999 of yacc.c.  */
-#line 1623 "y.tab.c"
+/* Line 991 of yacc.c.  */
+#line 1621 "y.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1733,13 +1732,28 @@ yyerrlab:
 
   /* Else will try to reuse lookahead token after shifting the error
      token.  */
-  goto yyerrlab1;
+  goto yyerrlab2;
 
 
 /*----------------------------------------------------.
 | yyerrlab1 -- error raised explicitly by an action.  |
 `----------------------------------------------------*/
 yyerrlab1:
+
+  /* Suppress GCC warning that yyerrlab1 is unused when no action
+     invokes YYERROR.  */
+#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__)
+  __attribute__ ((__unused__))
+#endif
+
+
+  goto yyerrlab2;
+
+
+/*---------------------------------------------------------------.
+| yyerrlab2 -- pop states until the error token can be shifted.  |
+`---------------------------------------------------------------*/
+yyerrlab2:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
diff --git a/src/engine/jamgram.h b/src/engine/jamgram.h
index d5ede563c..3cb765641 100644
--- a/src/engine/jamgram.h
+++ b/src/engine/jamgram.h
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875a.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/engine/jamgram.y b/src/engine/jamgram.y
index 3f169c802..6ce30b245 100644
--- a/src/engine/jamgram.y
+++ b/src/engine/jamgram.y
@@ -49,11 +49,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 /*
diff --git a/src/engine/jamgram.yy b/src/engine/jamgram.yy
index a8b30b4a4..f3fbc71ad 100644
--- a/src/engine/jamgram.yy
+++ b/src/engine/jamgram.yy
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 /*
diff --git a/src/engine/lists.h b/src/engine/lists.h
index 1d75426be..8a9079146 100644
--- a/src/engine/lists.h
+++ b/src/engine/lists.h
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 /*
diff --git a/src/engine/make.c b/src/engine/make.c
index 19c3d0776..83779eb09 100644
--- a/src/engine/make.c
+++ b/src/engine/make.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 /*
diff --git a/src/engine/make1.c b/src/engine/make1.c
index 2269f00a6..0d7423ea8 100644
--- a/src/engine/make1.c
+++ b/src/engine/make1.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 /*
diff --git a/src/engine/mkjambase.c b/src/engine/mkjambase.c
index f1af67073..815c76cfe 100644
--- a/src/engine/mkjambase.c
+++ b/src/engine/mkjambase.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 /*
diff --git a/src/engine/modules.c b/src/engine/modules.c
index b1344af8b..b7b89d62f 100644
--- a/src/engine/modules.c
+++ b/src/engine/modules.c
@@ -1,7 +1,7 @@
-/*  (C) Copyright David Abrahams 2001. Permission to copy, use, modify, sell and
- *  distribute this software is granted provided this copyright notice appears
- *  in all copies. This software is provided "as is" without express or implied
- *  warranty, and with no claim as to its suitability for any purpose.
+/*
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 #include "modules.h"
 #include "jam.h"
diff --git a/src/engine/modules.h b/src/engine/modules.h
index b58549d71..c66b1e1f1 100644
--- a/src/engine/modules.h
+++ b/src/engine/modules.h
@@ -1,7 +1,7 @@
-/*  (C) Copyright David Abrahams 2001. Permission to copy, use, modify, sell and
- *  distribute this software is granted provided this copyright notice appears
- *  in all copies. This software is provided "as is" without express or implied
- *  warranty, and with no claim as to its suitability for any purpose.
+/*
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 #ifndef MODULES_DWA10182001_H
 # define MODULES_DWA10182001_H
diff --git a/src/engine/parse.c b/src/engine/parse.c
index a1eb635d9..c630ee77a 100644
--- a/src/engine/parse.c
+++ b/src/engine/parse.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/parse.h b/src/engine/parse.h
index 223d249d0..ae9e9efc5 100644
--- a/src/engine/parse.h
+++ b/src/engine/parse.h
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 #ifndef PARSE_DWA20011020_H
diff --git a/src/engine/patchlevel.h b/src/engine/patchlevel.h
index d18953e52..064e93681 100644
--- a/src/engine/patchlevel.h
+++ b/src/engine/patchlevel.h
@@ -1,5 +1,5 @@
 /* Keep JAMVERSYM in sync with VERSION. */
 /* It can be accessed as $(JAMVERSION) in the Jamfile. */
 
-#define VERSION "3.1.9"
+#define VERSION "3.1.10"
 #define JAMVERSYM "JAMVERSION=3.1"
diff --git a/src/engine/pathmac.c b/src/engine/pathmac.c
index ad39a671b..4cbe8d40c 100644
--- a/src/engine/pathmac.c
+++ b/src/engine/pathmac.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/pathunix.c b/src/engine/pathunix.c
index 36b2e59b9..f029ad478 100644
--- a/src/engine/pathunix.c
+++ b/src/engine/pathunix.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/pathvms.c b/src/engine/pathvms.c
index a7633f0f9..86e3f0e59 100644
--- a/src/engine/pathvms.c
+++ b/src/engine/pathvms.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/rules.c b/src/engine/rules.c
index 516fa3101..c98751f2f 100644
--- a/src/engine/rules.c
+++ b/src/engine/rules.c
@@ -18,11 +18,9 @@
 # include "timestamp.h"
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 /*
diff --git a/src/engine/rules.h b/src/engine/rules.h
index 9c9e7851b..75d52b08e 100644
--- a/src/engine/rules.h
+++ b/src/engine/rules.h
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 #ifndef RULES_DWA_20011020_H
diff --git a/src/engine/search.c b/src/engine/search.c
index dfe29d991..d8f77b383 100644
--- a/src/engine/search.c
+++ b/src/engine/search.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/timestamp.c b/src/engine/timestamp.c
index fb0b7d405..f7c412808 100644
--- a/src/engine/timestamp.c
+++ b/src/engine/timestamp.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/variable.c b/src/engine/variable.c
index 3a5e773f8..ddcd9e714 100644
--- a/src/engine/variable.c
+++ b/src/engine/variable.c
@@ -5,11 +5,9 @@
  */
 
 /*  This file is ALSO:
- *  (C) Copyright David Abrahams 2001. Permission to copy, use,
- *  modify, sell and distribute this software is granted provided this
- *  copyright notice appears in all copies. This software is provided
- *  "as is" without express or implied warranty, and with no claim as
- *  to its suitability for any purpose.
+ *  Copyright 2001-2004 David Abrahams.
+ *  Distributed under the Boost Software License, Version 1.0.
+ *  (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  */
 
 # include "jam.h"
diff --git a/src/engine/yyacc.c b/src/engine/yyacc.c
index 90a703c80..3debec0d7 100644
--- a/src/engine/yyacc.c
+++ b/src/engine/yyacc.c
@@ -1,6 +1,6 @@
-/* (C) Copyright Rene Rivera, 2002.
-**
-** See accompanying license for terms and conditions of use.
+/* Copyright 2002 Rene Rivera.
+** Distributed under the Boost Software License, Version 1.0.
+** (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 */
 
 #include <stdio.h>