diff --git a/historic/jam/src/boost-jam.spec b/historic/jam/src/boost-jam.spec
index 8e0e2153a..5c3b3b254 100644
--- a/historic/jam/src/boost-jam.spec
+++ b/historic/jam/src/boost-jam.spec
@@ -4,7 +4,7 @@ Summary: Build tool
 Release: 1
 Source: %{name}-%{version}.tgz
 
-License: GPL
+License: Boost License
 Group: Development/Tools
 URL: http://www.boost.org
 Packager: Vladimir Prus <ghost@cs.msu.su>
@@ -31,11 +31,8 @@ Copyright:
     ALL WARRANTIES ARE HEREBY DISCLAIMED.
 
 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.
+    (C) Copyright David Abrahams 2001-2003.
+    See accompanying license for terms and conditions of use.
 
 %prep
 %setup -n %{name}-%{version}
@@ -50,7 +47,7 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 install -m 755 bin/bjam $RPM_BUILD_ROOT%{_bindir}/bjam-%{version}
 ln -sf bjam-%{version} $RPM_BUILD_ROOT%{_bindir}/bjam
 ln -sf bjam-%{version} $RPM_BUILD_ROOT%{_bindir}/jam
-install -m 644 $BOOST_JAM_DOCS $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 *.html Porting LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 find $RPM_BUILD_ROOT -name CVS -type d -depth -exec rm -r {} \;
 
@@ -62,4 +59,3 @@ find $RPM_BUILD_ROOT -name CVS -type d -depth -exec rm -r {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
diff --git a/historic/jam/src/build.jam b/historic/jam/src/build.jam
index 24a9ed480..241a2a1bc 100644
--- a/historic/jam/src/build.jam
+++ b/historic/jam/src/build.jam
@@ -567,7 +567,10 @@ rule .hdr.scan
 .scan [ GLOB . : *.c ] ;
 
 # Distribution making from here on out.
+dist.license =
+    [ GLOB . : LICENSE ] [ GLOB [ .path .. .. .. ] : LICENSE ] ;
 dist.docs =
+    $(dist.license[1])
     index.html
     Porting
     Jam.html
@@ -646,10 +649,26 @@ rule .binary
 # Package some file.
 rule .package ( dst-dir : src-files + )
 {
-    local src-dirs = ;
-    for local s in $(src-files:D) { if ! $(s) in $(src-dirs) && ! $(s) = "" { src-dirs += $(s) ; } }
-    local dst-files = $(src-files:R=$(dst-dir)) ;
-    local dst-dirs = $(src-dirs:R=$(dst-dir)) ;
+    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-file = $(src-path) ;
+        if $(src-dir:D=) = ".."
+        {
+            src-file = $(src-file:D=) ;
+        }
+        dst-files += $(src-file:R=$(dst-dir)) ;
+    }
     
     local pack = ;
     if $(NT) { pack = $(dst-dir).zip ; }
@@ -658,12 +677,19 @@ rule .package ( dst-dir : src-files + )
     DEPENDS dist : $(pack) ;
     DEPENDS $(pack) : $(dst-files) ;
     
-    for local src-file in $(src-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)) ;
-        DEPENDS $(dst-file) : $(src-file) $(dst-file:D) ;
+        DEPENDS $(dst-file) : $(src-path) $(dst-file:D) ;
         .mkdir $(dst-file:D) ;
-        .cp. $(dst-file) : $(src-file) ;
+        
+        .cp. $(dst-file) : $(src-path) ;
         .clean $(dst-file) ;
     }
     
@@ -701,7 +727,6 @@ rule .rpm ( name : source )
     .clean $(name).$(rpm-arch).rpm $(name).src.rpm ;
 }
 actions .rpm. {
-    export BOOST_JAM_DOCS="$(docs)"
     export BOOST_JAM_TOOLSET="$(toolset)"
     $(rpm-tool[1]) -ta $(target-opt)$(arch) $(>) | tee rpm.out
     cp `grep -e '^Wrote:' rpm.out | sed 's/^Wrote: //'` .
diff --git a/jam_src/boost-jam.spec b/jam_src/boost-jam.spec
index 8e0e2153a..5c3b3b254 100644
--- a/jam_src/boost-jam.spec
+++ b/jam_src/boost-jam.spec
@@ -4,7 +4,7 @@ Summary: Build tool
 Release: 1
 Source: %{name}-%{version}.tgz
 
-License: GPL
+License: Boost License
 Group: Development/Tools
 URL: http://www.boost.org
 Packager: Vladimir Prus <ghost@cs.msu.su>
@@ -31,11 +31,8 @@ Copyright:
     ALL WARRANTIES ARE HEREBY DISCLAIMED.
 
 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.
+    (C) Copyright David Abrahams 2001-2003.
+    See accompanying license for terms and conditions of use.
 
 %prep
 %setup -n %{name}-%{version}
@@ -50,7 +47,7 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 install -m 755 bin/bjam $RPM_BUILD_ROOT%{_bindir}/bjam-%{version}
 ln -sf bjam-%{version} $RPM_BUILD_ROOT%{_bindir}/bjam
 ln -sf bjam-%{version} $RPM_BUILD_ROOT%{_bindir}/jam
-install -m 644 $BOOST_JAM_DOCS $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 *.html Porting LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 find $RPM_BUILD_ROOT -name CVS -type d -depth -exec rm -r {} \;
 
@@ -62,4 +59,3 @@ find $RPM_BUILD_ROOT -name CVS -type d -depth -exec rm -r {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
diff --git a/jam_src/build.jam b/jam_src/build.jam
index 24a9ed480..241a2a1bc 100644
--- a/jam_src/build.jam
+++ b/jam_src/build.jam
@@ -567,7 +567,10 @@ rule .hdr.scan
 .scan [ GLOB . : *.c ] ;
 
 # Distribution making from here on out.
+dist.license =
+    [ GLOB . : LICENSE ] [ GLOB [ .path .. .. .. ] : LICENSE ] ;
 dist.docs =
+    $(dist.license[1])
     index.html
     Porting
     Jam.html
@@ -646,10 +649,26 @@ rule .binary
 # Package some file.
 rule .package ( dst-dir : src-files + )
 {
-    local src-dirs = ;
-    for local s in $(src-files:D) { if ! $(s) in $(src-dirs) && ! $(s) = "" { src-dirs += $(s) ; } }
-    local dst-files = $(src-files:R=$(dst-dir)) ;
-    local dst-dirs = $(src-dirs:R=$(dst-dir)) ;
+    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-file = $(src-path) ;
+        if $(src-dir:D=) = ".."
+        {
+            src-file = $(src-file:D=) ;
+        }
+        dst-files += $(src-file:R=$(dst-dir)) ;
+    }
     
     local pack = ;
     if $(NT) { pack = $(dst-dir).zip ; }
@@ -658,12 +677,19 @@ rule .package ( dst-dir : src-files + )
     DEPENDS dist : $(pack) ;
     DEPENDS $(pack) : $(dst-files) ;
     
-    for local src-file in $(src-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)) ;
-        DEPENDS $(dst-file) : $(src-file) $(dst-file:D) ;
+        DEPENDS $(dst-file) : $(src-path) $(dst-file:D) ;
         .mkdir $(dst-file:D) ;
-        .cp. $(dst-file) : $(src-file) ;
+        
+        .cp. $(dst-file) : $(src-path) ;
         .clean $(dst-file) ;
     }
     
@@ -701,7 +727,6 @@ rule .rpm ( name : source )
     .clean $(name).$(rpm-arch).rpm $(name).src.rpm ;
 }
 actions .rpm. {
-    export BOOST_JAM_DOCS="$(docs)"
     export BOOST_JAM_TOOLSET="$(toolset)"
     $(rpm-tool[1]) -ta $(target-opt)$(arch) $(>) | tee rpm.out
     cp `grep -e '^Wrote:' rpm.out | sed 's/^Wrote: //'` .