diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 0b4e880a8b9..b322bed8dc5 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -191,6 +191,9 @@ $(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-latex-eps
 %.eps: %.png
 	$(PNGTOPNM) $< | $(PNMTOPS) > $@
 
+%.pdf: %.svg
+	$(INKSCAPE) -z -f $(abspath $<) --export-pdf=$(abspath $@)
+
 $(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-htmlhelp
 	$(XSLTPROC) --stringparam htmlhelp.chm $*.chm \
 				--stringparam manifest.in.base.dir "$@/" \
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index 5da641ac691..e909e6e6c37 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -11,6 +11,7 @@ DOCSRCDIR=`dirname $0`/../docs-xml
 pushd $DOCSRCDIR || exit 1
 
 git clean -d -x -f
+export XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml"
 autoconf && \
 	./configure --with-papersize=letter && \
 	make smbdotconf/parameters.all.xml && \
@@ -28,8 +29,6 @@ rsync -Ca --exclude=.svn archives/ ../docs/
 cd ../docs || _exit "Error changing dir to ${DOCSDIR}/../docs/"
 
 /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
-mv manpages-3 manpages
-mv htmldocs/manpages-3 htmldocs/manpages
 
 cd ../docs-xml || _exit "Error changing dir to ${DOCSDIR}/../docs-xml/"
 make distclean