diff --git a/src/engine/jambase.c b/src/engine/jambase.c
index dbdf926f9..30b6de83d 100644
--- a/src/engine/jambase.c
+++ b/src/engine/jambase.c
@@ -1,73 +1,19 @@
 /* Generated by mkjambase from Jambase */
 char *jambase[] = {
 /* Jambase */
-"if $(NT)\n",
-"{\n",
-"SLASH ?= \\\\ ;\n",
-"}\n",
-"SLASH ?= / ;\n",
-"rule glob ( dirs * : patterns * )\n",
-"{\n",
-"return [ GLOB $(dirs:T) : $(dirs:T)\\\\$(SLASH)$(patterns) ] ;\n",
-"}\n",
-"rule find-to-root ( dir : patterns + )\n",
-"{\n",
-"local globs = [ glob $(dir) : $(patterns) ] ;\n",
-"while ! $(globs) && $(dir:P) != $(dir)\n",
-"{\n",
-"dir = $(dir:P) ;\n",
-"globs = [ glob $(dir) : $(patterns) ] ;\n",
-"}\n",
-"return $(globs) ;\n",
-"}\n",
-"rule boost-build ( dir ? )\n",
-"{\n",
-"if $(dir)\n",
-"{\n",
-"BOOST_BUILD_PATH = $(dir:R=$(file-location.boost-build.jam)) $(BOOST_BUILD_PATH) ;\n",
-"}\n",
-"local bootstrap-file =\n",
-"[ glob $(BOOST_BUILD_PATH) : boost-build.jam ] ;\n",
-"if ! $(bootstrap-file)\n",
-"{\n",
-"EXIT\n",
-"\"Unable to load Boost.Build, could not find build system files.\"\n",
-"\"Attempted search in these directories from BOOST_BUILD_PATH: \"$(BOOST_BUILD_PATH:J=\", \")\".\"\n",
-"\"Please consult the documentation at 'http://www.boost.org'.\" ;\n",
-"}\n",
-"include $(bootstrap-file[1]) ;\n",
-"}\n",
-"rule record-file-location ( file : location )\n",
-"{\n",
-"file-location.$(file:G=) = $(location) ;\n",
-"}\n",
-"if [ MATCH .*(bjam).* : $(ARGV[1]:B:L) ]\n",
-"|| $(BOOST_ROOT)    # A temporary measure so Jam works with Boost.Build v1\n",
+"if $(BOOST_ROOT)\n",
 "{\n",
 "BOOST_BUILD_PATH ?= $(BOOST_ROOT)/tools/build ;\n",
-"local boost-build-file =\n",
-"[ find-to-root [ PWD ] : boost-build.jam ]\n",
-"[ glob $(BOOST_BUILD_PATH) : boost-build.jam ] ;\n",
-"if ! $(boost-build-file)\n",
-"{\n",
-"EXIT\n",
-"\"Unable to load Boost.Build, could not find 'boost-build.jam'.\"\n",
-"\"Attempted search from\" [ PWD ] \"up to the root.\"\n",
-"\"And in these directories from BOOST_BUILD_PATH: \"$(BOOST_BUILD_PATH:J=\", \")\".\"\n",
-"\"Please consult the documentation at 'http://www.boost.org'.\" ;\n",
 "}\n",
-"BINDRULE on <jam-module>boost-base.jam = record-file-location ;\n",
-"file-location.boost-build.jam = $(boost-build-file[1]:D) ;\n",
-"include $(boost-build-file[1]) ;\n",
-"if ! [ RULENAMES build-system ] && ! $(file-location.boost-base.jam)\n",
+"if $(BOOST_BUILD_PATH)\n",
 "{\n",
-"EXIT\n",
-"\"Unable to load Boost.Build, it seems that the build system files\"\n",
-"\"where located, but the build system is not defined.\"\n",
-"\"Attempted to use, as the bootstrap, this file:\"\n",
-"$(file-location.boost-build.jam)$(SLASH)boost-build.jam.\n",
-"\"Please consult the documentation at 'http://www.boost.org'.\" ;\n",
+"JAMBASE ?= boost-build.jam ;\n",
 "}\n",
+"if $(JAMBASE)\n",
+"{\n",
+"JAMBASE = $(JAMBASE:G=jam-module) ; # puts the Jambase target in a different\n",
+"SEARCH on $(JAMBASE) = $(JAMBASE_PATH) $(BOOST_BUILD_PATH) ;\n",
+"include $(JAMBASE) ;\n",
 "}\n",
 "else\n",
 "{\n",