diff --git a/example/boost-build.jam b/example/boost-build.jam
index 07cef684..b7220e2c 100755
--- a/example/boost-build.jam
+++ b/example/boost-build.jam
@@ -2,6 +2,6 @@
 # Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-# Edit this path to point at the tools/build/v1 subdirectory of your
+# Edit this path to point at the tools/build/v2 subdirectory of your
 # Boost installation.  Absolute paths work, too.
 boost-build ../../../tools/build/v2 ;
diff --git a/example/tutorial/Jamfile b/example/tutorial/Jamfile
deleted file mode 100644
index 4aa0921c..00000000
--- a/example/tutorial/Jamfile
+++ /dev/null
@@ -1,18 +0,0 @@
-#   Hello World Example from the tutorial
-#   Copyright Joel de Guzman 2002-2004. Distributed under the Boost
-#   Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt 
-#   or copy at http://www.boost.org/LICENSE_1_0.txt)
-#   [Joel de Guzman 10/9/2002]
-
-# This is the top of our own project tree
-project-root ;
-
-#   Include definitions needed for Python modules
-import python ;
-
-extension hello                     # Declare a Python extension called hello
-:   hello.cpp                       # source
-    # requirements and dependencies for Boost.Python extensions
-    <template>@boost/libs/python/build/extension
-    ;
-
diff --git a/example/tutorial/Jamroot b/example/tutorial/Jamroot
new file mode 100755
index 00000000..06522873
--- /dev/null
+++ b/example/tutorial/Jamroot
@@ -0,0 +1,18 @@
+# Copyright David Abrahams 2006. Distributed under the Boost
+# Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+# Specify the path to the Boost project.  If you move this project,
+# adjust this path to refer to the Boost root directory.
+use-project boost 
+  : ../../../.. ;
+
+# Set up the project-wide requirements that everything uses the
+# boost_python library from the project whose global ID is
+# /boost/python.
+project
+  : requirements <library>/boost/python//boost_python ;
+
+# Declare a Python extension called hello.
+python-extension hello : hello.cpp ;
+
diff --git a/example/tutorial/Jamrules b/example/tutorial/Jamrules
deleted file mode 100644
index dc50254a..00000000
--- a/example/tutorial/Jamrules
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright David Abrahams 2003. See accompanying LICENSE for terms
-# and conditions of use.
-
-# If you move this example from its place in the Boost tree, edit this
-# path to point at the root directory of your Boost installation (the
-# one containing a subdirectory called "boost/" and a sub-subdirectory
-# "boost/python/" full of .hpp files).  Absolute paths work, too.
-#
-path-global BOOST_ROOT : ../../../.. ;
-
-# Boost.Python configuration variables, as described in
-# http://www.boost.org/libs/python/doc/building.html#configuration.
-# Usually you don't need to set these; the defaults will work.  If you
-# do set them, try to change as few of them as possible, starting with
-# the first ones.
-
-  # PYTHON_VERSION = <the two-part Major.Minor version number, e.g. 2.2> ;
-  # PYTHON_ROOT = <root directory of your Python installation, e.g. /usr> ;
-  # PYTHON_INCLUDES = <path to Python #include directories> ;
-  # PYTHON_LIB_PATH = <path to Python library object> ;
-
-# You may need to configure your compiler toolset, especially if you
-# want to build with a compiler that is not the "system default" or if
-# it is installed in a nonstandard place; see
-# http://www.boost.org/more/getting_started.html#Configuring for
-# details.  
-
-# Makes a project id for boost so that other Boost.Build projects can
-# refer to it by name.
-#
-project boost : $(BOOST_ROOT) ;
-
-# Change this setting to have all your built products placed under a
-# single directory:
-#
-# ALL_LOCATE_TARGET = <root directory for all built products>