diff --git a/doc/boostbook.xml b/doc/boostbook.xml
index ed593a1..c0afdd3 100644
--- a/doc/boostbook.xml
+++ b/doc/boostbook.xml
@@ -140,9 +140,9 @@ std::cout << f(5, 3) >> std::endl;
       happen in the BBv2 user configuration file,
       <filename>user-config.jam</filename>. If you do not have a copy
       of this file in your home directory, you should copy the one
-      that resides in <code>tools/build/v2</code> to your home
+      that resides in <code>tools/build/</code> to your home
       directory. Alternatively, you can edit
-      <filename>tools/build/v2/user-config.jam</filename> directly or
+      <filename>tools/build/user-config.jam</filename> directly or
       a site-wide <filename>site-config.jam</filename> file.</para>
 
       <section id="boostbook.setup.xsltproc">
diff --git a/setup_boostbook.py b/setup_boostbook.py
index b06736a..032587d 100644
--- a/setup_boostbook.py
+++ b/setup_boostbook.py
@@ -242,8 +242,8 @@ def find_user_config():
         JAM_CONFIG_IN_TEMP="yes"
         print "    Updating Boost.Jam configuration in %s... " % JAM_CONFIG_OUT
         return JAM_CONFIG_OUT
-    elif os.environ.has_key( "BOOST_ROOT" ) and os.path.exists( os.path.join( os.environ[ "BOOST_ROOT" ], "tools/build/v2/user-config.jam" ) ):
-        JAM_CONFIG_IN=os.path.join( os.environ[ "BOOST_ROOT" ], "tools/build/v2/user-config.jam" )
+    elif os.environ.has_key( "BOOST_ROOT" ) and os.path.exists( os.path.join( os.environ[ "BOOST_ROOT" ], "tools/build/user-config.jam" ) ):
+        JAM_CONFIG_IN=os.path.join( os.environ[ "BOOST_ROOT" ], "tools/build/user-config.jam" )
         print "    Found user-config.jam in BOOST_ROOT directory (%s)" % JAM_CONFIG_IN
         JAM_CONFIG_IN_TEMP="no"
         print "    Writing Boost.Jam configuration to %s... " % JAM_CONFIG_OUT
@@ -286,7 +286,7 @@ def setup_boostbook( tools_directory ):
 
     print "done."
 
-    print "Done! Execute \"bjam --v2\" in a documentation directory to generate"
+    print "Done! Execute \"b2\" in a documentation directory to generate"
     print "documentation with BoostBook. If you have not already, you will need"
     print "to compile Boost.Jam."
 
diff --git a/setup_boostbook.sh b/setup_boostbook.sh
old mode 100644
new mode 100755
index 0e79031..5434836
--- a/setup_boostbook.sh
+++ b/setup_boostbook.sh
@@ -129,8 +129,8 @@ if test -r "$HOME/user-config.jam"; then
   JAM_CONFIG_IN_TEMP="yes"
   echo -n "Updating Boost.Jam configuration in $JAM_CONFIG_OUT... "
 
-elif test -r "$BOOST_ROOT/tools/build/v2/user-config.jam"; then
-  JAM_CONFIG_IN="$BOOST_ROOT/tools/build/v2/user-config.jam";
+elif test -r "$BOOST_ROOT/tools/build/user-config.jam"; then
+  JAM_CONFIG_IN="$BOOST_ROOT/tools/build/user-config.jam";
   JAM_CONFIG_IN_TEMP="no"
   echo -n "Writing Boost.Jam configuration to $JAM_CONFIG_OUT... "
 else
@@ -176,6 +176,6 @@ awk -f setup_boostbook.awk $JAM_CONFIG_IN > $JAM_CONFIG_OUT
 rm -f setup_boostbook.awk
 echo "done."
 
-echo "Done! Execute \"bjam --v2\" in a documentation directory to generate"
+echo "Done! Execute \"b2\" in a documentation directory to generate"
 echo "documentation with BoostBook. If you have not already, you will need"
 echo "to compile Boost.Jam."
diff --git a/xsl/fo.xsl b/xsl/fo.xsl
index 7a036b9..88bacee 100644
--- a/xsl/fo.xsl
+++ b/xsl/fo.xsl
@@ -312,6 +312,39 @@
   </fo:inline>
 </xsl:template>
 
+<!-- alignment -->
+
+<xsl:template match="phrase[@role='aligncenter']">
+  <fo:inline>
+    <fo:block text-align="center">
+      <xsl:apply-templates/>
+    </fo:block>
+  </fo:inline>
+</xsl:template>
+
+<xsl:template match="phrase[@role='alignleft']">
+  <fo:inline>
+    <fo:block text-align="left">
+      <xsl:apply-templates/>
+    </fo:block>
+  </fo:inline>
+</xsl:template>
+
+<xsl:template match="phrase[@role='alignright']">
+  <fo:inline>
+    <fo:block text-align="right">
+     <xsl:apply-templates/>
+    </fo:block>
+  </fo:inline>
+</xsl:template>
+
+<xsl:template match="phrase[@role='alignjustify']">
+  <fo:inline>
+    <fo:block text-align="justify">
+     <xsl:apply-templates/>
+    </fo:block>
+  </fo:inline>
+</xsl:template>
 
   <!--