diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am
index c9e3424320..b631a84222 100644
--- a/docs/gst/Makefile.am
+++ b/docs/gst/Makefile.am
@@ -214,14 +214,21 @@ distclean-local: clean
 if DOC_HTML
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) 
-	(installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \
-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+	(installfiles=`echo ./html/*.html`; \
+	if test "$$installfiles" = './html/*.html'; \
 	then echo '-- Nothing to install' ; \
 	else \
 	  for i in $$installfiles; do \
 	    echo '-- Installing '$$i ; \
 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
 	  done; \
+	  pngfiles=`echo ./html/*.png`; \
+	  if test "$$pngfiles" != './html/*.png'; then \
+	    for i in $$pngfiles; do \
+	      echo '-- Installing '$$i ; \
+	      $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+	    done; \
+	  fi; \
 	  echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
 	  $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
 	    $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
@@ -229,8 +236,8 @@ install-data-local:
 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
 	fi) 
 uninstall-local:
-	(installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \
-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+	(installfiles=`echo ./html/*.html`; \
+	if test "$$installfiles" = './html/*.html'; \
 	then echo '-- Nothing to uninstall' ; \
 	else \
 	  for i in $$installfiles; do \
@@ -238,6 +245,14 @@ uninstall-local:
 	    echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
 	    rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
 	  done; \
+	  pngfiles=`echo ./html/*.png`; \
+	  if test "$$pngfiles" != './html/*.png'; then \
+	    for i in $$pngfiles; do \
+	      rmfile=`basename $$i` ; \
+	      echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
+	      rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
+	    done; \
+	  fi; \
 	  echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp' ; \
 	  rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
 	  echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 7d636e73c4..e2101b6ef8 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -212,24 +212,31 @@ distclean-local: clean
 
 if DOC_HTML
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \
-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) 
+	(installfiles=`echo ./html/*.html`; \
+	if test "$$installfiles" = './html/*.html'; \
 	then echo '-- Nothing to install' ; \
 	else \
 	  for i in $$installfiles; do \
 	    echo '-- Installing '$$i ; \
 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
 	  done; \
-          echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
-          $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
-            $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
+	  pngfiles=`echo ./html/*.png`; \
+	  if test "$$pngfiles" != './html/*.png'; then \
+	    for i in $$pngfiles; do \
+	      echo '-- Installing '$$i ; \
+	      $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+	    done; \
+	  fi; \
+	  echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
+	  $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
+	    $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-	fi)
+	fi) 
 uninstall-local:
-	(installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \
-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+	(installfiles=`echo ./html/*.html`; \
+	if test "$$installfiles" = './html/*.html'; \
 	then echo '-- Nothing to uninstall' ; \
 	else \
 	  for i in $$installfiles; do \
@@ -237,6 +244,14 @@ uninstall-local:
 	    echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
 	    rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
 	  done; \
+	  pngfiles=`echo ./html/*.png`; \
+	  if test "$$pngfiles" != './html/*.png'; then \
+	    for i in $$pngfiles; do \
+	      rmfile=`basename $$i` ; \
+	      echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
+	      rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
+	    done; \
+	  fi; \
 	  echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp' ; \
 	  rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
 	  echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \
diff --git a/docs/manuals.mak b/docs/manuals.mak
index 7c12eb622c..a42533ba8e 100644
--- a/docs/manuals.mak
+++ b/docs/manuals.mak
@@ -94,7 +94,7 @@ $(BUILDDIR)/$(MAIN): $(XML) $(CSS)
 html/index.html: $(BUILDDIR)/$(MAIN) $(PNG_BUILT) $(FIG_SRC)
 	@echo "*** Generating HTML output ***"
 	@-mkdir -p html
-	@cp $(srcdir)/../image-png $(BUILDDIR)/image.entities
+	@cp -f $(srcdir)/../image-png $(BUILDDIR)/image.entities
 	@cd $(BUILDDIR) && xmlto html -o ../html $(MAIN)
 	@test "x$(CSS)" != "x" && \
           echo "Copying .css files: $(CSS)" && \
@@ -106,8 +106,9 @@ html/index.html: $(BUILDDIR)/$(MAIN) $(PNG_BUILT) $(FIG_SRC)
 
 $(DOC).ps: $(BUILDDIR)/$(MAIN) $(EPS_BUILT) $(PNG_SRC) $(FIG_SRC)
 	@echo "*** Generating PS output ***"
-	@cp $(srcdir)/../image-eps $(BUILDDIR)/image.entities
-	export LC_PAPER=$(PAPER_LOCALE) && cd $(BUILDDIR) && xmlto ps -o .. $(MAIN)
+	@cp -f $(srcdir)/../image-eps $(BUILDDIR)/image.entities
+	cd $(BUILDDIR) && docbook2ps -o .. $(MAIN)
+#	export LC_PAPER=$(PAPER_LOCALE) && cd $(BUILDDIR) && xmlto ps -o .. $(MAIN)
 
 $(DOC).pdf: $(DOC).ps
 	@echo "*** Generating PDF output ***"
@@ -115,7 +116,7 @@ $(DOC).pdf: $(DOC).ps
 
 #$(DOC).pdf: $(MAIN) $(PDF) $(FIG_SRC)
 #	@echo "*** Generating PDF output ***"
-#	@cp $(srcdir)/../image-pdf image.entities
+#	@cp -f $(srcdir)/../image-pdf image.entities
 #	@export LC_PAPER=$(PAPER_LOCALE) && xmlto pdf $(MAIN)
 #	@rm image.entities