diff --git a/docs/howto/Group-Mapping.xml b/docs/howto/Group-Mapping.xml
index 41860d17573..9e5b7488289 100644
--- a/docs/howto/Group-Mapping.xml
+++ b/docs/howto/Group-Mapping.xml
@@ -56,15 +56,15 @@
 
 	<figure id="idmap-sid2gid"><title>IDMAP: group SID to GID resolution.</title>
 	<mediaobject>
-	<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/idmap-sid2gid" scale="50" scalefit="1"/></imageobject>
-	<imageobject><imagedata fileref="projdoc/imagefiles/idmap-sid2gid.png" scale="50" scalefit="1"/></imageobject>
+	<imageobject role="latex"><imagedata fileref="howto/imagefiles/idmap-sid2gid" scale="50" scalefit="1"/></imageobject>
+	<imageobject><imagedata fileref="howto/imagefiles/idmap-sid2gid.png" scale="50" scalefit="1"/></imageobject>
 	</mediaobject>
 	</figure>
 
 	<figure id="idmap-gid2sid"><title>IDMAP: GID resolution to matching SID.</title>
 	<mediaobject>
-	<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/idmap-gid2sid" scale="50" scalefit="1"/></imageobject>
-	<imageobject><imagedata fileref="projdoc/imagefiles/idmap-gid2sid.png" scale="50" scalefit="1"/></imageobject>
+	<imageobject role="latex"><imagedata fileref="howto/imagefiles/idmap-gid2sid" scale="50" scalefit="1"/></imageobject>
+	<imageobject><imagedata fileref="howto/imagefiles/idmap-gid2sid.png" scale="50" scalefit="1"/></imageobject>
 	</mediaobject>
 	</figure>
 
@@ -77,8 +77,8 @@
 
 	<figure id="idmap-store-gid2sid"><title>IDMAP storing group mappings.</title>
 	<mediaobject>
-	<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/idmap-store-gid2sid" scale="50" scalefit="1"/></imageobject>
-	<imageobject><imagedata fileref="projdoc/imagefiles/idmap-store-gid2sid.png" scale="50" scalefit="1"/></imageobject>
+	<imageobject role="latex"><imagedata fileref="howto/imagefiles/idmap-store-gid2sid" scale="50" scalefit="1"/></imageobject>
+	<imageobject><imagedata fileref="howto/imagefiles/idmap-store-gid2sid.png" scale="50" scalefit="1"/></imageobject>
 	</mediaobject>
 	</figure>
 
diff --git a/docs/howto/PDC.xml b/docs/howto/PDC.xml
index 6d3fa64a24e..09947ca522e 100644
--- a/docs/howto/PDC.xml
+++ b/docs/howto/PDC.xml
@@ -33,8 +33,8 @@ network clients.
 
 <figure id="domain-example"><title>An Example Domain.</title>
 <mediaobject>
-<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/domain" width="4in" height="3in" scalefit="1"/></imageobject>
-<imageobject><imagedata fileref="projdoc/imagefiles/domain.png" scale="50" scalefit="1"/></imageobject>
+<imageobject role="latex"><imagedata fileref="howto/imagefiles/domain" width="4in" height="3in" scalefit="1"/></imageobject>
+<imageobject><imagedata fileref="howto/imagefiles/domain.png" scale="50" scalefit="1"/></imageobject>
 </mediaobject>
 </figure>
 
diff --git a/docs/howto/Winbind.xml b/docs/howto/Winbind.xml
index 909c54e7e0f..66bbe992256 100644
--- a/docs/howto/Winbind.xml
+++ b/docs/howto/Winbind.xml
@@ -91,8 +91,8 @@
 
 	<!--	<figure id="winbind_idmap"><title></title>
 	<mediaobject>
-	<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/idmap_winbind_no_loop" scale="50" scalefit="1"/></imageobject>
-	<imageobject><imagedata fileref="projdoc/imagefiles/idmap_winbind_no_loop.png" scale="50" scalefit="1"/></imageobject>
+	<imageobject role="latex"><imagedata fileref="howto/imagefiles/idmap_winbind_no_loop" scale="50" scalefit="1"/></imageobject>
+	<imageobject><imagedata fileref="howto/imagefiles/idmap_winbind_no_loop.png" scale="50" scalefit="1"/></imageobject>
 	</mediaobject>
 	</figure>-->
 
diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index d72725ab26d..217f621f80c 100644
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -254,7 +254,7 @@
 					<xsl:attribute name="role"><xsl:text>latex</xsl:text></xsl:attribute>
 					<xsl:element name="imagedata">
 						<xsl:attribute name="fileref">
-							<xsl:text>projdoc/imagefiles/</xsl:text><xsl:value-of select="imagefile"/></xsl:attribute>
+							<xsl:text>howto/imagefiles/</xsl:text><xsl:value-of select="imagefile"/></xsl:attribute>
 						<xsl:attribute name="scale">
 							<xsl:choose>
 								<xsl:when test="@scale != ''">
@@ -272,7 +272,7 @@
 				<xsl:element name="imageobject">
 					<xsl:element name="imagedata">
 						<xsl:attribute name="fileref">
-							<xsl:text>projdoc/imagefiles/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
+							<xsl:text>howto/imagefiles/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
 						<xsl:attribute name="scale"><xsl:text>50</xsl:text></xsl:attribute>
 						<xsl:attribute name="scalefit"><xsl:text>1</xsl:text></xsl:attribute>
 					</xsl:element>