diff --git a/chapters/tutorial.xml b/chapters/tutorial.xml
index a99671c514..a88e6c8530 100644
--- a/chapters/tutorial.xml
+++ b/chapters/tutorial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.30 $ -->
+<!-- $Revision: 1.31 $ -->
  <chapter id="tutorial">
   <title>A simple tutorial</title>
 
@@ -440,7 +440,7 @@ Hi Joe. You are 22 years old.
     </para>
     <example>
      <title>A simple XForms search form</title>
-     <screen>
+     <programlisting role="html">
 <![CDATA[
 <h:html xmlns:h="http://www.w3.org/1999/xhtml"
         xmlns="http://www.w3.org/2002/xforms">
@@ -459,7 +459,7 @@ Hi Joe. You are 22 years old.
 </h:body>
 </h:html>
 ]]>
-     </screen>
+     </programlisting>
     </example>
     <para>
      The above form displays a text input box (named <parameter>q</parameter>),
@@ -486,7 +486,7 @@ Hi Joe. You are 22 years old.
     </para>
     <example>
      <title>Using an XForm to populate $_POST</title>
-     <screen>
+     <programlisting role="html">
 <![CDATA[
 <h:html xmlns:h="http://www.w3.org/1999/xhtml"
         xmlns="http://www.w3.org/2002/xforms">
@@ -505,7 +505,7 @@ Hi Joe. You are 22 years old.
 </h:body>
 </h:html>
 ]]>
-     </screen>
+     </programlisting>
     </example>
     <note>
      <simpara>