diff --git a/ChangeLog b/ChangeLog
index 03fbc029b..ef671cb42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-08  David Turner  <david@freetype.org>
+
+        * Jamrules, Jamfile, Jamfile.in, src/*/Jamfile: small changes to
+        support the compilation of FreeType 2 as part of larger projects with
+        their own configuration options (only with Jam)
+
 2003-01-07  David Turner  <david@freetype.org>
 
         * src/base/ftstroker.c: probably the last bug-fixes to the stroker,
diff --git a/Jamfile b/Jamfile
index b6d4af021..2ba53bd66 100644
--- a/Jamfile
+++ b/Jamfile
@@ -100,7 +100,10 @@ if $(DEBUG_HINTER)
 # We need "freetype2/include" in the current include path in order to
 # compile any part of FreeType 2.
 #
-SubDirHdr += $(FT2_INCLUDE) ;
+HDRS += $(FT2_INCLUDE) ;
+
+
+#SubDirHdr += $(FT2_INCLUDE) ;
 
 # Uncomment the following line if you want to build individual source files
 # for each FreeType 2 module.
diff --git a/Jamrules b/Jamrules
index eb65f9265..c05e50854 100644
--- a/Jamrules
+++ b/Jamrules
@@ -6,6 +6,19 @@
 #
 
 
+# call SubDirHdrs on a list of directories
+#
+rule AddSubDirHdrs
+{
+  local x ;
+
+  for x in $(<)
+  {
+    SubDirHdrs $(x) ;
+  }
+}
+
+
 # Determine prefix of library file.  We must use "libxxxxx" on Unix systems,
 # while all other simply use the real name.
 #
@@ -39,11 +52,6 @@ rule FT2_SubDir
   }
 }
 
-# The directory "include" must be in the current include path when compiling
-# any part of FreeType.  We thus update the HDRS variable there.
-#
-HDRS += [ FT2_SubDir  include ] ;
-
 # We also set ALL_LOCATE_TARGET in order to place all object and library
 # files in "objs".
 #
diff --git a/src/base/Jamfile b/src/base/Jamfile
index bc4c71dcd..55e5e6ab1 100644
--- a/src/base/Jamfile
+++ b/src/base/Jamfile
@@ -3,6 +3,7 @@
 
 SubDir  FT2_TOP $(FT2_SRC_DIR) base ;
 
+
 {
   local  _sources ;