diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8bd67cb3..92e6dd5e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -11,16 +11,6 @@ EXTRA_DIST =				\
 	api.xsl				\
 	apibuild.py			\
 	checkapisym.xsl			\
-	images/callouts/1.png		\
-	images/callouts/10.png		\
-	images/callouts/2.png		\
-	images/callouts/3.png		\
-	images/callouts/4.png		\
-	images/callouts/5.png		\
-	images/callouts/6.png		\
-	images/callouts/7.png		\
-	images/callouts/8.png		\
-	images/callouts/9.png		\
 	libxslt-api.xml			\
 	libxslt-refs.xml		\
 	symbols.xml			\
@@ -31,6 +21,16 @@ EXTRA_DIST =				\
 	xsltproc.xml
 
 nobase_doc_DATA =			\
+	tutorial/images/callouts/1.png	\
+	tutorial/images/callouts/10.png	\
+	tutorial/images/callouts/2.png	\
+	tutorial/images/callouts/3.png	\
+	tutorial/images/callouts/4.png	\
+	tutorial/images/callouts/5.png	\
+	tutorial/images/callouts/6.png	\
+	tutorial/images/callouts/7.png	\
+	tutorial/images/callouts/8.png	\
+	tutorial/images/callouts/9.png	\
 	tutorial/libxslt_tutorial.c	\
 	tutorial/libxslttutorial.html	\
 	tutorial2/libxslt_pipes.c	\
@@ -50,11 +50,11 @@ rebuild:
 	cd $(srcdir) && $(XSLTPROC) -o $(WIN32_DIR)/libexslt.def.src \
 	  --nonet $(WIN32_DIR)/defgen.xsl EXSLT/libexslt-api.xml
 
-wildcards =			\
-	*.1			\
-	*.html			\
-	*.xsl			\
-	images/callouts/*.png	\
+wildcards =				\
+	*.1				\
+	*.html				\
+	*.xsl				\
+	tutorial/images/callouts/*.png	\
 	tutorial*/libxslt*
 
 # This target verifies that EXTRA_DIST contains all the files matched by
diff --git a/doc/images/callouts/1.png b/doc/tutorial/images/callouts/1.png
similarity index 100%
rename from doc/images/callouts/1.png
rename to doc/tutorial/images/callouts/1.png
diff --git a/doc/images/callouts/10.png b/doc/tutorial/images/callouts/10.png
similarity index 100%
rename from doc/images/callouts/10.png
rename to doc/tutorial/images/callouts/10.png
diff --git a/doc/images/callouts/2.png b/doc/tutorial/images/callouts/2.png
similarity index 100%
rename from doc/images/callouts/2.png
rename to doc/tutorial/images/callouts/2.png
diff --git a/doc/images/callouts/3.png b/doc/tutorial/images/callouts/3.png
similarity index 100%
rename from doc/images/callouts/3.png
rename to doc/tutorial/images/callouts/3.png
diff --git a/doc/images/callouts/4.png b/doc/tutorial/images/callouts/4.png
similarity index 100%
rename from doc/images/callouts/4.png
rename to doc/tutorial/images/callouts/4.png
diff --git a/doc/images/callouts/5.png b/doc/tutorial/images/callouts/5.png
similarity index 100%
rename from doc/images/callouts/5.png
rename to doc/tutorial/images/callouts/5.png
diff --git a/doc/images/callouts/6.png b/doc/tutorial/images/callouts/6.png
similarity index 100%
rename from doc/images/callouts/6.png
rename to doc/tutorial/images/callouts/6.png
diff --git a/doc/images/callouts/7.png b/doc/tutorial/images/callouts/7.png
similarity index 100%
rename from doc/images/callouts/7.png
rename to doc/tutorial/images/callouts/7.png
diff --git a/doc/images/callouts/8.png b/doc/tutorial/images/callouts/8.png
similarity index 100%
rename from doc/images/callouts/8.png
rename to doc/tutorial/images/callouts/8.png
diff --git a/doc/images/callouts/9.png b/doc/tutorial/images/callouts/9.png
similarity index 100%
rename from doc/images/callouts/9.png
rename to doc/tutorial/images/callouts/9.png
diff --git a/doc/tutorial/libxslttutorial.html b/doc/tutorial/libxslttutorial.html
index a512629f..36da4503 100644
--- a/doc/tutorial/libxslttutorial.html
+++ b/doc/tutorial/libxslttutorial.html
@@ -282,11 +282,11 @@ xsltSaveResultToFile(stdout, res, cur);
 <p>
       
 	  <pre class="programlisting">
-	  xsltFreeStylesheet(cur);<a name="cleanupstylesheet"></a><img src="../images/callouts/1.png" alt="1" border="0">
-	  xmlFreeDoc(res);<a name="cleanupresults"></a><img src="../images/callouts/2.png" alt="2" border="0">
-	  xmlFreeDoc(doc);<a name="cleanupdoc"></a><img src="../images/callouts/3.png" alt="3" border="0">
-	  xsltCleanupGlobals();<a name="cleanupglobals"></a><img src="../images/callouts/4.png" alt="4" border="0">
-	  xmlCleanupParser();<a name="cleanupparser"></a><img src="../images/callouts/5.png" alt="5" border="0">
+	  xsltFreeStylesheet(cur);<a name="cleanupstylesheet"></a><img src="images/callouts/1.png" alt="1" border="0">
+	  xmlFreeDoc(res);<a name="cleanupresults"></a><img src="images/callouts/2.png" alt="2" border="0">
+	  xmlFreeDoc(doc);<a name="cleanupdoc"></a><img src="images/callouts/3.png" alt="3" border="0">
+	  xsltCleanupGlobals();<a name="cleanupglobals"></a><img src="images/callouts/4.png" alt="4" border="0">
+	  xmlCleanupParser();<a name="cleanupparser"></a><img src="images/callouts/5.png" alt="5" border="0">
 
 	  </pre>
 	
@@ -294,28 +294,28 @@ xsltSaveResultToFile(stdout, res, cur);
 <a name="id2708994"></a><table border="0" summary="Callout list">
 <tr>
 <td width="5%" valign="top" align="left">
-<a name="id2709000"></a><a href="#cleanupstylesheet"><img src="../images/callouts/1.png" alt="1" border="0"></a> </td>
+<a name="id2709000"></a><a href="#cleanupstylesheet"><img src="images/callouts/1.png" alt="1" border="0"></a> </td>
 <td valign="top" align="left"><p>Free the memory used by your stylesheet.</p></td>
 </tr>
 <tr>
 <td width="5%" valign="top" align="left">
-<a name="id2709117"></a><a href="#cleanupresults"><img src="../images/callouts/2.png" alt="2" border="0"></a> </td>
+<a name="id2709117"></a><a href="#cleanupresults"><img src="images/callouts/2.png" alt="2" border="0"></a> </td>
 <td valign="top" align="left"><p>Free the memory used by the results document.</p></td>
 </tr>
 <tr>
 <td width="5%" valign="top" align="left">
-<a name="id2709136"></a><a href="#cleanupdoc"><img src="../images/callouts/3.png" alt="3" border="0"></a> </td>
+<a name="id2709136"></a><a href="#cleanupdoc"><img src="images/callouts/3.png" alt="3" border="0"></a> </td>
 <td valign="top" align="left"><p>Free the memory used by your original document.</p></td>
 </tr>
 <tr>
 <td width="5%" valign="top" align="left">
-<a name="id2709155"></a><a href="#cleanupglobals"><img src="../images/callouts/4.png" alt="4" border="0"></a> </td>
+<a name="id2709155"></a><a href="#cleanupglobals"><img src="images/callouts/4.png" alt="4" border="0"></a> </td>
 <td valign="top" align="left"><p>Free memory used by libxslt global
 	    variables</p></td>
 </tr>
 <tr>
 <td width="5%" valign="top" align="left">
-<a name="id2709176"></a><a href="#cleanupparser"><img src="../images/callouts/5.png" alt="5" border="0"></a> </td>
+<a name="id2709176"></a><a href="#cleanupparser"><img src="images/callouts/5.png" alt="5" border="0"></a> </td>
 <td valign="top" align="left"><p>Free memory used by the XML parser</p></td>
 </tr>
 </table>