101 files changed, 129 insertions, 123 deletions
diff --git a/docs/Makefile.in b/docs/Makefile.in
index f041a8c249..c391031c4f 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -16,6 +16,7 @@ PNMTOPNG = @PNMTOPNG@
 PNMTOPS = @PNMTOPS@
 HTML2TEXT = @HTML2TEXT@
 PLUCKERBUILD = @PLUCKERBUILD@
+COPY_IMAGES = ./scripts/copy-images.sh
 THUMBPDF = @THUMBPDF@
 PDFLATEX = TEXINPUTS=xslt/latex:.: @PDFLATEX@ --file-line-error-style
 LATEX = TEXINPUTS=xslt/latex:.: @LATEX@ --file-line-error-style
@@ -55,15 +56,6 @@ MANPAGES = $(wildcard $(MANPAGEDIR)/*.?.xml)
 LATEX_FIGURES = xslt/figures/caution.pdf xslt/figures/important.pdf xslt/figures/note.pdf xslt/figures/tip.pdf xslt/figures/warning.pdf
 MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES_SOURCES))
 
-Samba_HOWTO_Collection_IMAGES_PNG = $(wildcard Samba-HOWTO-Collection/imagefiles/*.png)
-Samba_Guide_IMAGES_PNG = $(wildcard Samba-Guide/images/*.png)
-
-Samba_HOWTO_Collection_IMAGEDIR = Samba-HOWTO-Collection/imagefiles
-Samba_Guide_IMAGEDIR = Samba-Guide/images
-
-Samba_HOWTO_Collection_IMAGES_EPS = $(patsubst %.png,%.eps,$(Samba_HOWTO_Collection_IMAGES_PNG))
-Samba_Guide_IMAGES_EPS = $(patsubst %.png,%.eps,$(Samba_Guide_IMAGES_PNG))
-
 help: 
 	@echo "Supported make targets:"
 	@echo " release - Build the docs needed for a Samba release"
@@ -106,11 +98,11 @@ htmlhelp: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLHELPDIR)/%,$(MAIN_DOCS))
 
 $(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl
 	mkdir -p $(@D)
-	$(XSLTPROC) --stringparam noreference 1 --stringparam imagedir "$($(subst -,_,$*)_IMAGEDIR)/" --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+	$(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
 
 $(DOCBOOKDIR)/%.xml: $(MANPAGEDIR)/%.xml xslt/expand-sambadoc.xsl
 	mkdir -p $(@D)
-	$(XSLTPROC) --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $<
+	$(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $<
 
 $(DOCBOOKDIR)/manpages.xml: $(MANPAGES_SOURCES) xslt/manpage-summary.xsl
 	mkdir -p $(@D)
@@ -127,15 +119,17 @@ $(HTMLDIR)/index.html: htmldocs.html
 $(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css  xslt/html-chunk.xsl
 	mkdir -p $(@D)
 	$(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/$*/" xslt/html-chunk.xsl $<
-	-mkdir $(HTMLDIR)/$*/images
+	-mkdir $(@D)/images
+	$(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $(@D)
 
 # Single large HTML files
 $(OUTPUTDIR)/%/samba.css: xslt/html/samba.css
 	mkdir -p $(@D)
 	cp $< $@
 
-$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css $(patsubst %.png,$(HTMLDIR)/images/%.png,$(%_IMAGES_PNG)) xslt/html.xsl
-	mkdir -p $(@D)
+$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl 
+	mkdir -p $(@D)/images
+	$(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $(@D)
 	$(XSLTPROC) --output $@ xslt/html.xsl $<
 
 %-attributions.xml: 
@@ -169,7 +163,7 @@ $(PDFDIR)/%.pdf: %.pdf
 	cp $< $@
 
 # Adobe PDF files
-%.pdf: %.tex latexfigures gpl.tex $(%_IMAGES_PNG)
+%.pdf: %.tex latexfigures gpl.tex 
 	-$(PDFLATEX) $<
 	-$(PDFLATEX) $<
 	$(MAKEINDEX) $*
@@ -181,7 +175,8 @@ $(DVIDIR)/%.dvi: %.dvi
 	mkdir -p $(@D)
 	cp $< $@
 
-%.dvi: %.tex %.idx gpl.tex $(%_IMAGES_EPS)
+%.dvi: %.tex %.idx gpl.tex
+	$(MAKE) $(shell $(XSLTPROC) --stringparam prepend "" --stringparam append ".eps" --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml)
 	-$(LATEX) $< 
 	-$(LATEX) $< 
 	$(MAKEINDEX) $*
@@ -203,13 +198,9 @@ $(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml
 	mkdir -p $(@D)
 	$(XSLTPROC) --output $@ http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
 
-# HTML Help
-$(HTMLHELPDIR)/%/images/%.png: $(%_IMAGEDIR)/%.png
-	mkdir -p $(@D)
-	cp $< $@
-
-$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml #$(patsubst $(%_IMAGEDIR)/%.png,$(HTMLHELPDIR)/%/images/%.png,$(%_IMAGEDIR)/*.png)
-	-mkdir $@
+$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml
+	-mkdir -p $@/images
+	$(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $@
 	$(XSLTPROC) --stringparam htmlhelp.chm $*.chm --stringparam manifest.in.base.dir "$@/" --stringparam base.dir "$@/" http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
 
 # Plucker docs
diff --git a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
index d677e4cba3..6058411b35 100644
--- a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
+++ b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
@@ -289,13 +289,13 @@
 		</para>
 
 		<image id="pktcap01">
-			<imagefile scale="53">WINREPRESSME-Capture.png</imagefile>
-			<description>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</description>
+			<imagefile scale="53">WINREPRESSME-Capture</imagefile>
+			<imagedescription>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</imagedescription>
 		</image>
 
 		<image id="pktcap02">
-			<description>Windows Me &smbmdash; Later Broadcast Sample</description>
-			<imagefile scale="57">WINREPRESSME-Capture2.png</imagefile>
+			<imagedescription>Windows Me &smbmdash; Later Broadcast Sample</imagedescription>
+			<imagefile scale="57">WINREPRESSME-Capture2</imagefile>
 		</image>
 
 	  <para><indexterm>
@@ -601,8 +601,8 @@
 		</sect3>
 
 		<image id="hostannounce">
-			<description>Typical Windows 9x/Me Host Announcement</description>
-			<imagefile scale="55">HostAnnouncment.png</imagefile>
+			<imagedescription>Typical Windows 9x/Me Host Announcement</imagedescription>
+			<imagefile scale="55">HostAnnouncment</imagefile>
 		</image>
 
 	</sect2>
@@ -725,9 +725,9 @@
 		</para>
 
 		<image id="nullconnect">
-			<description>Typical Windows 9x/Me NULL SessionSetUp AndX Request</description>
+			<imagedescription>Typical Windows 9x/Me NULL SessionSetUp AndX Request</imagedescription>
 
-			<imagefile scale="65">NullConnect.png</imagefile>
+			<imagefile scale="65">NullConnect</imagefile>
 		</image>
 
 		<para>
@@ -743,8 +743,8 @@
 		</para>
 
 		<image id="userconnect">
-			<description>Typical Windows 9x/Me User SessionSetUp AndX Request</description>
-			<imagefile scale="65">UserConnect.png</imagefile>
+			<imagedescription>Typical Windows 9x/Me User SessionSetUp AndX Request</imagedescription>
+			<imagefile scale="65">UserConnect</imagefile>
 		</image>
 
 	 	<para>
@@ -898,13 +898,13 @@
 	</procedure>
 
 	<image id="XPCap01">
-        <description>Typical Windows XP NULL Session Setup AndX Request</description>
-		<imagefile scale="70">WindowsXP-NullConnection.png</imagefile>
+        <imagedescription>Typical Windows XP NULL Session Setup AndX Request</imagedescription>
+		<imagefile scale="70">WindowsXP-NullConnection</imagefile>
 	</image>
 
 	<image id="XPCap02">
-        <description>Typical Windows XP User Session Setup AndX Request</description>
-		<imagefile scale="70">WindowsXP-UserConnection.png</imagefile>
+        <imagedescription>Typical Windows XP User Session Setup AndX Request</imagedescription>
+		<imagefile scale="70">WindowsXP-UserConnection</imagefile>
 	</image>
 
 		<sect3>
diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
index 4e42b52039..8a0d359cf9 100644
--- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
@@ -497,8 +497,8 @@
 		</para>
 
 		<image id="charitynet">
-			<description>Charity Administration Office Network</description>
-			<imagefile scale="100">Charity-Network.png</imagefile>
+			<imagedescription>Charity Administration Office Network</imagedescription>
+			<imagefile scale="100">Charity-Network</imagefile>
 		</image>
 
 		<procedure>
@@ -986,8 +986,8 @@ C:\WINDOWS: regedit ME-dpwc.reg
 		</para>
 
 		<image id="acctingnet2">
-			<description>Accounting Office Network Topology</description>
-			<imagefile scale="100">AccountingNetwork.png</imagefile>
+			<imagedescription>Accounting Office Network Topology</imagedescription>
+			<imagefile scale="100">AccountingNetwork</imagefile>
 		</image>
 
 		<table id="acctingnet">
diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
index f874a8b678..8a4e1ef2b2 100644
--- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml
+++ b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
@@ -303,8 +303,8 @@
 	</para>
 
 	<image id="acct2net">
-		<description>Abmas Accounting &smbmdash; 52 User Network Topology</description>
-		<imagefile scale="100">acct2net.png</imagefile>
+		<imagedescription>Abmas Accounting &smbmdash; 52 User Network Topology</imagedescription>
+		<imagefile scale="100">acct2net</imagefile>
 	</image>
 
 	<procedure>
diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
index 5ec4ab2166..7f8366c08a 100644
--- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
@@ -163,8 +163,8 @@
 		</table>
 
 		<image id="ch04net">
-			<description>Abmas Network Topology &smbmdash; 130 Users</description>
-			<imagefile scale="90">chap4-net.png</imagefile>
+			<imagedescription>Abmas Network Topology &smbmdash; 130 Users</imagedescription>
+			<imagefile scale="90">chap4-net</imagefile>
 		</image>
 
 		<para>
diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml
index 3c679c1b09..5375eb99a3 100644
--- a/docs/Samba-Guide/Chap05-500UserNetwork.xml
+++ b/docs/Samba-Guide/Chap05-500UserNetwork.xml
@@ -326,8 +326,8 @@
 	</para>
 
 	<image id="chap05net">
-		<description>Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend.</description>
-		<imagefile scale="80">chap5-net.png</imagefile>
+		<imagedescription>Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend.</imagedescription>
+		<imagefile scale="80">chap5-net</imagefile>
 	</image>
 
 	<sect2 id="ch5-dnshcp-setup">
diff --git a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
index c8a547ac67..75acc22f3d 100644
--- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
@@ -575,8 +575,8 @@
 	</para>
 
 	<image id="ch6-LDAPdiag">
-		<description>The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts</description>
-		<imagefile scale="70">UNIX-Samba-and-LDAP.png</imagefile>
+		<imagedescription>The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts</imagedescription>
+		<imagefile scale="70">UNIX-Samba-and-LDAP</imagefile>
 	</image>
 
 	<para><indexterm>
@@ -959,8 +959,8 @@
 	</para>
 
 	<image id="chap6net">
-		<description>Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend.</description>
-		<imagefile scale="70">chap6-net.png</imagefile>
+		<imagedescription>Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend.</imagedescription>
+		<imagefile scale="70">chap6-net</imagefile>
 	</image>
 
       <para><indexterm>
@@ -3131,8 +3131,8 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\
 	</procedure>
 
 	<image id="XP-screen001">
-		<description>Windows XP Professional &smbmdash; User Shared Folders</description>
-		<imagefile scale="65">XP-screen001.png</imagefile>
+		<imagedescription>Windows XP Professional &smbmdash; User Shared Folders</imagedescription>
+		<imagefile scale="65">XP-screen001</imagefile>
 	</image>
 
 <table id="proffold">
diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
index 73134cf108..6ad6c6e8bf 100644
--- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml
+++ b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
@@ -709,13 +709,13 @@
 	    inconsistent directory information can be exceedingly difficult.</para>
 
 	<image id="chap7net">
-		<description>Network Topology &smbmdash; 2000 User Complex Design A</description>
-		<imagefile scale="80">chap7-net-Ar.png</imagefile>
+		<imagedescription>Network Topology &smbmdash; 2000 User Complex Design A</imagedescription>
+		<imagefile scale="80">chap7-net-Ar</imagefile>
 	</image>
 
 	<image id="chap7net2">
-		<description>Network Topology &smbmdash; 2000 User Complex Design B</description>
-		<imagefile scale="80">chap7-net2-Br.png</imagefile>
+		<imagedescription>Network Topology &smbmdash; 2000 User Complex Design B</imagedescription>
+		<imagefile scale="80">chap7-net2-Br</imagefile>
 	</image>
 
 	</sect3>
@@ -759,8 +759,8 @@
 	</para>
 
 	<image id="chap7idres">
-		<description>Samba and Authentication Backend Search Pathways</description>
-		<imagefile scale="80">chap7-idresol.png</imagefile>
+		<imagedescription>Samba and Authentication Backend Search Pathways</imagedescription>
+		<imagefile scale="80">chap7-idresol</imagefile>
 	</image>
 
       <para><indexterm>
@@ -800,8 +800,8 @@ passdb backend = ldapsam:ldap://master.abmas.biz
 	This configuration tells Samba to use a single LDAP server as shown in
 	<link linkend="ch7singleLDAP"/>.
 	<image id="ch7singleLDAP">
-		<description>Samba Configuration to Use a Single LDAP Server</description>
-		<imagefile scale="100">ch7-singleLDAP.png</imagefile>
+		<imagedescription>Samba Configuration to Use a Single LDAP Server</imagedescription>
+		<imagefile scale="100">ch7-singleLDAP</imagefile>
 	</image>
 	<indexterm>
 	  <primary>LDAP</primary>
@@ -822,8 +822,8 @@ passdb backend = ldapsam:"ldap://master.abmas.biz \
 	This configuration tells Samba to use a master LDAP server, with fail-over to a slave server if necessary,
 	as shown in <link linkend="ch7dualLDAP"/>.
 	<image id="ch7dualLDAP">
-		<description>Samba Configuration to Use a Dual (Fail-over) LDAP Server</description>
-		<imagefile scale="100">ch7-fail-overLDAP.png</imagefile>
+		<imagedescription>Samba Configuration to Use a Dual (Fail-over) LDAP Server</imagedescription>
+		<imagefile scale="100">ch7-fail-overLDAP</imagefile>
 	</image>
       </para>
 
@@ -847,8 +847,8 @@ passdb backend = ldapsam:ldap://master.abmas.biz \
 	</para>
 
 	<image id="ch7dualadd">
-		<description>Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use!</description>
-		<imagefile scale="80">ch7-dual-additive-LDAP.png</imagefile>
+		<imagedescription>Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use!</imagedescription>
+		<imagefile scale="80">ch7-dual-additive-LDAP</imagefile>
 	</image>
 
 	<para>
@@ -859,8 +859,8 @@ passdb backend = ldapsam:ldap://master.abmas.biz \
         </para>
 
 		<image id="ch7dualok">
-			<description>Samba Configuration to Use Two LDAP Databases - The result is additive.</description>
-			<imagefile scale="80">ch7-dual-additive-LDAP-Ok.png</imagefile>
+			<imagedescription>Samba Configuration to Use Two LDAP Databases - The result is additive.</imagedescription>
+			<imagefile scale="80">ch7-dual-additive-LDAP-Ok</imagefile>
 		</image>
 
 	<note><para>
diff --git a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
index a6b196f365..e8f55b8611 100644
--- a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
+++ b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
@@ -183,8 +183,8 @@
 		</para>
 
 		<image id="ch8-migration">
-			<description>Schematic Explaining the <command>net rpc vampire</command> Process</description>
-			<imagefile scale="80">ch8-migration.png</imagefile>
+			<imagedescription>Schematic Explaining the <command>net rpc vampire</command> Process</imagedescription>
+			<imagefile scale="80">ch8-migration</imagefile>
 		</image>
 
 		<para>
@@ -297,8 +297,8 @@
 		</para>
 
 		<image id="NT4DUM">
-			<description>View of Accounts in NT4 Domain User Manager</description>
-			<imagefile scale="50">UserMgrNT4.png</imagefile>
+			<imagedescription>View of Accounts in NT4 Domain User Manager</imagedescription>
+			<imagefile scale="50">UserMgrNT4</imagefile>
 		</image>
 
 	</sect2>
diff --git a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
index e46fc22396..2efdde6539 100644
--- a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
@@ -29,8 +29,8 @@
 	</para>
 
 	<image id="ch09openmag">
-		<description>Open Magazine Samba Survey</description>
-		<imagefile scale="60">openmag.png</imagefile>
+		<imagedescription>Open Magazine Samba Survey</imagedescription>
+		<imagefile scale="60">openmag</imagefile>
 	</image>
 
 	<para>
@@ -516,8 +516,8 @@
 	</para>
 
 <image id="ch9-sambadc">
-	<description>Samba Domain: Samba Member Server</description>
-	<imagefile scale="75">chap9-SambaDC.png</imagefile>
+	<imagedescription>Samba Domain: Samba Member Server</imagedescription>
+	<imagefile scale="75">chap9-SambaDC</imagefile>
 </image>
 
 	<para><indexterm>
@@ -1098,8 +1098,8 @@ aliases:        files
 	</para>
 
 	<image id="ch9-adsdc">
-		<description>Active Directory Domain: Samba Member Server</description>
-		<imagefile scale="75">chap9-ADSDC.png</imagefile>
+		<imagedescription>Active Directory Domain: Samba Member Server</imagedescription>
+		<imagefile scale="75">chap9-ADSDC</imagefile>
 	</image>
 
 	<procedure>
diff --git a/docs/Samba-Guide/Chap12-Appendix.xml b/docs/Samba-Guide/Chap12-Appendix.xml
index c3b244c405..0d1546d949 100644
--- a/docs/Samba-Guide/Chap12-Appendix.xml
+++ b/docs/Samba-Guide/Chap12-Appendix.xml
@@ -1195,8 +1195,8 @@ example:
 	</para>
 
 	<image id="lam-login">
-		<description>The LDAP Account Manager Login Screen</description>
-		<imagefile scale="50">lam-login.png</imagefile>
+		<imagedescription>The LDAP Account Manager Login Screen</imagedescription>
+		<imagefile scale="50">lam-login</imagefile>
 	</image>
 
       <para><indexterm>
@@ -1214,8 +1214,8 @@ example:
 	</para>
 
 	<image id="lam-config">
-		<description>The LDAP Account Manager Configuration Screen</description>
-		<imagefile scale="50">lam-config.png</imagefile>
+		<imagedescription>The LDAP Account Manager Configuration Screen</imagedescription>
+		<imagefile scale="50">lam-config</imagefile>
 	</image>
 
       <para><indexterm>
@@ -1241,8 +1241,8 @@ example:
 	</para>
 
 	<image id="lam-user">
-		<description>The LDAP Account Manager User Edit Screen</description>
-		<imagefile scale="50">lam-users.png</imagefile>
+		<imagedescription>The LDAP Account Manager User Edit Screen</imagedescription>
+		<imagefile scale="50">lam-users</imagefile>
 	</image>
 
 	<para>
@@ -1253,13 +1253,13 @@ example:
 	</para>
 
 	<image id="lam-group">
-		<description>The LDAP Account Manager Group Edit Screen</description>
-		<imagefile scale="50">lam-groups.png</imagefile>
+		<imagedescription>The LDAP Account Manager Group Edit Screen</imagedescription>
+		<imagefile scale="50">lam-groups</imagefile>
 	</image>
 
 	<image id="lam-group-mem">
-		<description>The LDAP Account Manager Group Membership Edit Screen</description>
-		<imagefile scale="50">lam-group-members.png</imagefile>
+		<imagedescription>The LDAP Account Manager Group Membership Edit Screen</imagedescription>
+		<imagefile scale="50">lam-group-members</imagefile>
 	</image>
 
       <para><indexterm>
@@ -1273,8 +1273,8 @@ example:
 	</para>
 
 	<image id="lam-host">
-		<description>The LDAP Account Manager Host Edit Screen</description>
-		<imagefile scale="50">lam-hosts.png</imagefile>
+		<imagedescription>The LDAP Account Manager Host Edit Screen</imagedescription>
+		<imagefile scale="50">lam-hosts</imagefile>
 	</image>
 
 	<para>
diff --git a/docs/Samba-HOWTO-Collection/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/Group-Mapping.xml
index 7197b12a21..bad2cfe9d7 100644
--- a/docs/Samba-HOWTO-Collection/Group-Mapping.xml
+++ b/docs/Samba-HOWTO-Collection/Group-Mapping.xml
@@ -63,19 +63,14 @@
 	parameters in the &smb.conf; file.
 	</para>
 
-	<figure id="idmap-sid2gid"><title>IDMAP: group SID to GID resolution.</title>
-	<mediaobject>
-	<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="howto/imagefiles/idmap-gid2sid" scale="50" scalefit="1"/></imageobject>
-	<imageobject><imagedata fileref="howto/imagefiles/idmap-gid2sid.png" scale="50" scalefit="1"/></imageobject>
-	</mediaobject>
-	</figure>
+	<image id="idmap-sid2gid">
+		<description>IDMAP: group SID to GID resolution.</description>
+		<imagefile scale="50">idmap-sid2gid</imagefile>
+	</image>
+
+	<image id="idmap-gid2sid"><description>IDMAP: GID resolution to matching SID.</description>
+	<imagefile scale="50">idmap-gid2sid</imagefile>
+	</image>
 
 	<para>
 	In both cases, when winbindd is not running, only locally resolvable groups can be recognized. Please refer to
@@ -84,13 +79,9 @@
 	used to establish UNIX group to NT SID mappings as shown in <link linkend="idmap-store-gid2sid">IDMAP: storing group mappings</link>.
 	</para>
 
-	<figure id="idmap-store-gid2sid"><title>IDMAP storing group mappings.</title>
-	<mediaobject>
-	<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>
-
+	<image id="idmap-store-gid2sid"><description>IDMAP storing group mappings.</description>
+	<imagefile scale="50">idmap-store-gid2sid</imagefile>
+	</image>
 
 	<para>
 	<indexterm><primary>groupadd</primary></indexterm>
diff --git a/docs/Samba-HOWTO-Collection/PDC.xml b/docs/Samba-HOWTO-Collection/PDC.xml
index 4504c480b8..8a83997347 100644
--- a/docs/Samba-HOWTO-Collection/PDC.xml
+++ b/docs/Samba-HOWTO-Collection/PDC.xml
@@ -41,13 +41,9 @@ network environment. Workstations A, B and C are representative of many physical
 network clients.
 </para>
 
-<figure id="domain-example"><title>An Example Domain.</title>
-<mediaobject>
-<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>
-
+<image id="domain-example"><description>An Example Domain.</description>
+<imagefile scale="50">domain</imagefile>
+</image>
 
 <?latex \newpage ?>
 
diff --git a/docs/Samba-HOWTO-Collection/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml
index 2f3018f894..ae8450c772 100644
--- a/docs/Samba-HOWTO-Collection/Winbind.xml
+++ b/docs/Samba-HOWTO-Collection/Winbind.xml
@@ -95,12 +95,9 @@
 	</para></note>
 
 
-	<!--	<figure id="winbind_idmap"><title></title>
-	<mediaobject>
-	<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>-->
+	<image id="winbind_idmap">
+	<imagefile scale="50">idmap_winbind_no_loop</imagefile>
+	</image>
 
 </sect1>
 
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/.cvsignore b/docs/Samba-HOWTO-Collection/images/.cvsignore
index f7b5423899..f7b5423899 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/.cvsignore
+++ b/docs/Samba-HOWTO-Collection/images/.cvsignore
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/10small.png b/docs/Samba-HOWTO-Collection/images/10small.png
index 56a9b0cd67..56a9b0cd67 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/10small.png
+++ b/docs/Samba-HOWTO-Collection/images/10small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/11small.png b/docs/Samba-HOWTO-Collection/images/11small.png
index 18f5d9e4dd..18f5d9e4dd 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/11small.png
+++ b/docs/Samba-HOWTO-Collection/images/11small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/12small.png b/docs/Samba-HOWTO-Collection/images/12small.png
index 5bdf809c1b..5bdf809c1b 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/12small.png
+++ b/docs/Samba-HOWTO-Collection/images/12small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/13small.png b/docs/Samba-HOWTO-Collection/images/13small.png
index 536b2fc2c2..536b2fc2c2 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/13small.png
+++ b/docs/Samba-HOWTO-Collection/images/13small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/14small.png b/docs/Samba-HOWTO-Collection/images/14small.png
index 89054249c0..89054249c0 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/14small.png
+++ b/docs/Samba-HOWTO-Collection/images/14small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/1small.png b/docs/Samba-HOWTO-Collection/images/1small.png
index c4905163c9..c4905163c9 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/1small.png
+++ b/docs/Samba-HOWTO-Collection/images/1small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/2small.png b/docs/Samba-HOWTO-Collection/images/2small.png
index 5fd9071349..5fd9071349 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/2small.png
+++ b/docs/Samba-HOWTO-Collection/images/2small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/3small.png b/docs/Samba-HOWTO-Collection/images/3small.png
index 22a39bae52..22a39bae52 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/3small.png
+++ b/docs/Samba-HOWTO-Collection/images/3small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/4small.png b/docs/Samba-HOWTO-Collection/images/4small.png
index 6b7f1b1fd4..6b7f1b1fd4 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/4small.png
+++ b/docs/Samba-HOWTO-Collection/images/4small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/5small.png b/docs/Samba-HOWTO-Collection/images/5small.png
index b23e1fc2c7..b23e1fc2c7 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/5small.png
+++ b/docs/Samba-HOWTO-Collection/images/5small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/6small.png b/docs/Samba-HOWTO-Collection/images/6small.png
index 35a646d826..35a646d826 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/6small.png
+++ b/docs/Samba-HOWTO-Collection/images/6small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/7small.png b/docs/Samba-HOWTO-Collection/images/7small.png
index d182677510..d182677510 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/7small.png
+++ b/docs/Samba-HOWTO-Collection/images/7small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/8small.png b/docs/Samba-HOWTO-Collection/images/8small.png
index 08aca66386..08aca66386 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/8small.png
+++ b/docs/Samba-HOWTO-Collection/images/8small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/9small.png b/docs/Samba-HOWTO-Collection/images/9small.png
index 90c2cde327..90c2cde327 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/9small.png
+++ b/docs/Samba-HOWTO-Collection/images/9small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME001.png b/docs/Samba-HOWTO-Collection/images/WME001.png
index c5db7570bc..c5db7570bc 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME001.png
+++ b/docs/Samba-HOWTO-Collection/images/WME001.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME002.png b/docs/Samba-HOWTO-Collection/images/WME002.png
index 641f2179a0..641f2179a0 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME002.png
+++ b/docs/Samba-HOWTO-Collection/images/WME002.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME003.png b/docs/Samba-HOWTO-Collection/images/WME003.png
index 073c58eddd..073c58eddd 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME003.png
+++ b/docs/Samba-HOWTO-Collection/images/WME003.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME004.png b/docs/Samba-HOWTO-Collection/images/WME004.png
index 5053adeeec..5053adeeec 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME004.png
+++ b/docs/Samba-HOWTO-Collection/images/WME004.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME005.png b/docs/Samba-HOWTO-Collection/images/WME005.png
index 5e4e72e498..5e4e72e498 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME005.png
+++ b/docs/Samba-HOWTO-Collection/images/WME005.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME006.png b/docs/Samba-HOWTO-Collection/images/WME006.png
index cbd3183696..cbd3183696 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME006.png
+++ b/docs/Samba-HOWTO-Collection/images/WME006.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME007.png b/docs/Samba-HOWTO-Collection/images/WME007.png
index e0a113b080..e0a113b080 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME007.png
+++ b/docs/Samba-HOWTO-Collection/images/WME007.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME008.png b/docs/Samba-HOWTO-Collection/images/WME008.png
index b03a7853b4..b03a7853b4 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME008.png
+++ b/docs/Samba-HOWTO-Collection/images/WME008.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME009.png b/docs/Samba-HOWTO-Collection/images/WME009.png
index f851876cee..f851876cee 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME009.png
+++ b/docs/Samba-HOWTO-Collection/images/WME009.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME010.png b/docs/Samba-HOWTO-Collection/images/WME010.png
index 589be02b22..589be02b22 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME010.png
+++ b/docs/Samba-HOWTO-Collection/images/WME010.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME011.png b/docs/Samba-HOWTO-Collection/images/WME011.png
index f15399b4a2..f15399b4a2 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME011.png
+++ b/docs/Samba-HOWTO-Collection/images/WME011.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME012.png b/docs/Samba-HOWTO-Collection/images/WME012.png
index d2e46212f6..d2e46212f6 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME012.png
+++ b/docs/Samba-HOWTO-Collection/images/WME012.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME013.png b/docs/Samba-HOWTO-Collection/images/WME013.png
index 0f0a70d062..0f0a70d062 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME013.png
+++ b/docs/Samba-HOWTO-Collection/images/WME013.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME014.png b/docs/Samba-HOWTO-Collection/images/WME014.png
index 73f1dde37c..73f1dde37c 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME014.png
+++ b/docs/Samba-HOWTO-Collection/images/WME014.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP002.png b/docs/Samba-HOWTO-Collection/images/WXPP002.png
index b87001bca4..b87001bca4 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WXPP002.png
+++ b/docs/Samba-HOWTO-Collection/images/WXPP002.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP003.png b/docs/Samba-HOWTO-Collection/images/WXPP003.png
index a60d6c413a..a60d6c413a 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WXPP003.png
+++ b/docs/Samba-HOWTO-Collection/images/WXPP003.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP005.png b/docs/Samba-HOWTO-Collection/images/WXPP005.png
index 4aa091767b..4aa091767b 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WXPP005.png
+++ b/docs/Samba-HOWTO-Collection/images/WXPP005.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP009.png b/docs/Samba-HOWTO-Collection/images/WXPP009.png
index b540e238b8..b540e238b8 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WXPP009.png
+++ b/docs/Samba-HOWTO-Collection/images/WXPP009.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP014.png b/docs/Samba-HOWTO-Collection/images/WXPP014.png
index f1e02d3ce3..f1e02d3ce3 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WXPP014.png
+++ b/docs/Samba-HOWTO-Collection/images/WXPP014.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/a_small.png b/docs/Samba-HOWTO-Collection/images/a_small.png
index a6622ef6cf..a6622ef6cf 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/a_small.png
+++ b/docs/Samba-HOWTO-Collection/images/a_small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/access1.dia b/docs/Samba-HOWTO-Collection/images/access1.dia
index 7fd2673800..7fd2673800 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/access1.dia
+++ b/docs/Samba-HOWTO-Collection/images/access1.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/access1.png b/docs/Samba-HOWTO-Collection/images/access1.png
index 0d070a6109..0d070a6109 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/access1.png
+++ b/docs/Samba-HOWTO-Collection/images/access1.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/browsing1 b/docs/Samba-HOWTO-Collection/images/browsing1
index 8235df45f6..8235df45f6 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/browsing1
+++ b/docs/Samba-HOWTO-Collection/images/browsing1
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/browsing1.png b/docs/Samba-HOWTO-Collection/images/browsing1.png
index bfe76dcb63..bfe76dcb63 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/browsing1.png
+++ b/docs/Samba-HOWTO-Collection/images/browsing1.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/cups1.dia b/docs/Samba-HOWTO-Collection/images/cups1.dia
index e4cd3b1239..e4cd3b1239 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/cups1.dia
+++ b/docs/Samba-HOWTO-Collection/images/cups1.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/cups1.png b/docs/Samba-HOWTO-Collection/images/cups1.png
index cbe646a5fa..cbe646a5fa 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/cups1.png
+++ b/docs/Samba-HOWTO-Collection/images/cups1.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/cups2.dia b/docs/Samba-HOWTO-Collection/images/cups2.dia
index 9dfb60f335..9dfb60f335 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/cups2.dia
+++ b/docs/Samba-HOWTO-Collection/images/cups2.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/cups2.png b/docs/Samba-HOWTO-Collection/images/cups2.png
index d0713c07ca..d0713c07ca 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/cups2.png
+++ b/docs/Samba-HOWTO-Collection/images/cups2.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/domain.dia b/docs/Samba-HOWTO-Collection/images/domain.dia
index a994d423e2..a994d423e2 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/domain.dia
+++ b/docs/Samba-HOWTO-Collection/images/domain.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/domain.png b/docs/Samba-HOWTO-Collection/images/domain.png
index 82d299b086..82d299b086 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/domain.png
+++ b/docs/Samba-HOWTO-Collection/images/domain.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/ethereal1.png b/docs/Samba-HOWTO-Collection/images/ethereal1.png
index c8655389d0..c8655389d0 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/ethereal1.png
+++ b/docs/Samba-HOWTO-Collection/images/ethereal1.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/ethereal2.png b/docs/Samba-HOWTO-Collection/images/ethereal2.png
index f366772d3b..f366772d3b 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/ethereal2.png
+++ b/docs/Samba-HOWTO-Collection/images/ethereal2.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.dia b/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.dia
index b3b1d88c50..b3b1d88c50 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.png
index b8cf5d2257..b8cf5d2257 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.dia b/docs/Samba-HOWTO-Collection/images/idmap-groups.dia
index 04da158c53..04da158c53 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap-groups.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.png b/docs/Samba-HOWTO-Collection/images/idmap-groups.png
index e5c214574f..e5c214574f 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap-groups.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.dia b/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.dia
index e6e5107698..e6e5107698 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.png b/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.png
index daadfc1f90..daadfc1f90 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.dia b/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.dia
index 91e00530a6..91e00530a6 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.png b/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.png
index 3acc07bd11..3acc07bd11 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.dia b/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.dia
index 957613b6f3..957613b6f3 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png
index 911c996329..911c996329 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.dia b/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.dia
index de6ccaacb3..de6ccaacb3 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.png
index f30c632500..f30c632500 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap.dia b/docs/Samba-HOWTO-Collection/images/idmap.dia
index 555933978b..555933978b 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap.png b/docs/Samba-HOWTO-Collection/images/idmap.png
index b090ced632..b090ced632 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap_winbind_no_loop.png b/docs/Samba-HOWTO-Collection/images/idmap_winbind_no_loop.png
index 5393f6a192..5393f6a192 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap_winbind_no_loop.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap_winbind_no_loop.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.dia b/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.dia
index 2f846ee8d4..2f846ee8d4 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.dia
+++ b/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.png b/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.png
index b80efe9f16..b80efe9f16 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.png
+++ b/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.dia b/docs/Samba-HOWTO-Collection/images/pdftosocket.dia
index 53b6b7117c..53b6b7117c 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.dia
+++ b/docs/Samba-HOWTO-Collection/images/pdftosocket.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.png b/docs/Samba-HOWTO-Collection/images/pdftosocket.png
index ea4a9dae93..ea4a9dae93 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.png
+++ b/docs/Samba-HOWTO-Collection/images/pdftosocket.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/trusts1.dia b/docs/Samba-HOWTO-Collection/images/trusts1.dia
index 95cbbaa42f..95cbbaa42f 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/trusts1.dia
+++ b/docs/Samba-HOWTO-Collection/images/trusts1.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/trusts1.png b/docs/Samba-HOWTO-Collection/images/trusts1.png
index 72aa60d4cc..72aa60d4cc 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/trusts1.png
+++ b/docs/Samba-HOWTO-Collection/images/trusts1.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp001.png b/docs/Samba-HOWTO-Collection/images/w2kp001.png
index 43adf23463..43adf23463 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/w2kp001.png
+++ b/docs/Samba-HOWTO-Collection/images/w2kp001.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp002.png b/docs/Samba-HOWTO-Collection/images/w2kp002.png
index 13bb029f53..13bb029f53 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/w2kp002.png
+++ b/docs/Samba-HOWTO-Collection/images/w2kp002.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp003.png b/docs/Samba-HOWTO-Collection/images/w2kp003.png
index c7b779900e..c7b779900e 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/w2kp003.png
+++ b/docs/Samba-HOWTO-Collection/images/w2kp003.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp004.png b/docs/Samba-HOWTO-Collection/images/w2kp004.png
index d0e005a36e..d0e005a36e 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/w2kp004.png
+++ b/docs/Samba-HOWTO-Collection/images/w2kp004.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp005.png b/docs/Samba-HOWTO-Collection/images/w2kp005.png
index a729b40cd7..a729b40cd7 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/w2kp005.png
+++ b/docs/Samba-HOWTO-Collection/images/w2kp005.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp006.png b/docs/Samba-HOWTO-Collection/images/w2kp006.png
index ea96db055a..ea96db055a 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/w2kp006.png
+++ b/docs/Samba-HOWTO-Collection/images/w2kp006.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp001.png b/docs/Samba-HOWTO-Collection/images/wxpp001.png
index 2e689a17e2..2e689a17e2 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp001.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp001.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp004.png b/docs/Samba-HOWTO-Collection/images/wxpp004.png
index 656f67942e..656f67942e 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp004.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp004.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp006.png b/docs/Samba-HOWTO-Collection/images/wxpp006.png
index a20b3ed583..a20b3ed583 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp006.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp006.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp007.png b/docs/Samba-HOWTO-Collection/images/wxpp007.png
index cf41352220..cf41352220 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp007.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp007.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp008.png b/docs/Samba-HOWTO-Collection/images/wxpp008.png
index 9958c7c873..9958c7c873 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp008.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp008.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp010.png b/docs/Samba-HOWTO-Collection/images/wxpp010.png
index 068a0dfc73..068a0dfc73 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp010.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp010.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp011.png b/docs/Samba-HOWTO-Collection/images/wxpp011.png
index 0cf88c04a6..0cf88c04a6 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp011.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp011.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp012.png b/docs/Samba-HOWTO-Collection/images/wxpp012.png
index d89f3b5d31..d89f3b5d31 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp012.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp012.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp013.png b/docs/Samba-HOWTO-Collection/images/wxpp013.png
index 451240ee38..451240ee38 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp013.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp013.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp015.png b/docs/Samba-HOWTO-Collection/images/wxpp015.png
index 12fe2f31b2..12fe2f31b2 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp015.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp015.png
diff --git a/docs/scripts/copy-images.sh b/docs/scripts/copy-images.sh
new file mode 100755
index 0000000000..9f654a34ae
--- /dev/null
+++ b/docs/scripts/copy-images.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+ROLE="$1"
+XMLFILE="$2"
+FROM="$3"
+TO="$4"
+
+for x in `xsltproc --stringparam prepend "" --stringparam append "" --stringparam role "$ROLE" xslt/find-image-dependencies.xsl "$XMLFILE"`
+do
+	cp -u $FROM/$x $TO/$x || exit 1
+done
+exit
diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index 8d132a9935..cd91bff8a1 100644
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -239,7 +239,7 @@
 					<xsl:attribute name="role"><xsl:text>latex</xsl:text></xsl:attribute>
 					<xsl:element name="imagedata">
 						<xsl:attribute name="fileref">
-							<xsl:value-of select="$imagedir"/><xsl:value-of select="imagefile"/></xsl:attribute>
+							<xsl:value-of select="$latex.imagebasedir"/><xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/></xsl:attribute>
 						<xsl:attribute name="scale">
 							<xsl:choose>
 								<xsl:when test="@scale != ''">
diff --git a/docs/xslt/find-image-dependencies.xsl b/docs/xslt/find-image-dependencies.xsl
new file mode 100644
index 0000000000..f658369145
--- /dev/null
+++ b/docs/xslt/find-image-dependencies.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0'?>
+<!--
+	Find the image dependencies of a certain XML file
+	(C) Jelmer Vernooij	2004
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.1">
+	<xsl:output method="text"/>
+
+	<xsl:template match="mediaobject/imageobject[@role=$role]">
+		<xsl:value-of select="$prepend"/>
+		<xsl:value-of select="imagedata/@fileref"/>
+		<xsl:value-of select="$append"/>
+		<xsl:text> </xsl:text>
+	</xsl:template>
+
+	<xsl:template match="text()"/>
+	<xsl:template match="*">
+		<xsl:apply-templates/>
+	</xsl:template>
+</xsl:stylesheet>