diff --git a/docs/manual/BUILD b/docs/manual/BUILD
index 9a874920bc..bc12aefdd1 100644
--- a/docs/manual/BUILD
+++ b/docs/manual/BUILD
@@ -2,6 +2,8 @@ For now use:
 
   db2html gstreamer-manual 
 
+(On debian, db2html is in the cygnus-stylesheets package)
+
 You will need the png support for docbook (see GNOME documentation project)
 
 convert the fig images to png with:
diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index 961d7cfcbc..72880fb70c 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -79,12 +79,14 @@ htmlinst:
 	@if [ -r gstreamer-manual/gstreamer.html ] ; then \
 	echo "Installing HTML documentation" ; \
 	    $(mkinstalldirs) $(DESTDIR)$(docdatadir)/gstreamer-manual ; \
-	    $(INSTALL_DATA) gstreamer-manual/* $(DESTDIR)$(docdatadir)/gstreamer-manual ; \
+	    $(mkinstalldirs) $(DESTDIR)$(docdatadir)/gstreamer-manual/images ; \
+	    $(INSTALL_DATA) gstreamer-manual/*.html $(DESTDIR)$(docdatadir)/gstreamer-manual ; \
 	else \
 	    if [ -r $(srcdir)/gstreamer-manual/gstreamer.html ] ; then \
 	        echo "Installing HTML documentation" ; \
 	        $(mkinstalldirs) $(DESTDIR)$(docdatadir)/gstreamer-manual ; \
-	        $(INSTALL_DATA) $(srcdir)/gstreamer-manual/* $(DESTDIR)$(docdatadir)/gstreamer-manual ; \
+	        $(mkinstalldirs) $(DESTDIR)$(docdatadir)/gstreamer-manual/images ; \
+	        $(INSTALL_DATA) $(srcdir)/gstreamer-manual/*.html $(DESTDIR)$(docdatadir)/gstreamer-manual ; \
 	    else \
 	        echo "NOT installing HTML documentation: not present, and can't generate" ; \
 	    fi \
diff --git a/docs/manual/README b/docs/manual/README
index 9a874920bc..bc12aefdd1 100644
--- a/docs/manual/README
+++ b/docs/manual/README
@@ -2,6 +2,8 @@ For now use:
 
   db2html gstreamer-manual 
 
+(On debian, db2html is in the cygnus-stylesheets package)
+
 You will need the png support for docbook (see GNOME documentation project)
 
 convert the fig images to png with:
diff --git a/docs/manual/images/Makefile.am b/docs/manual/images/Makefile.am
index 3fc0557855..003e57bd5b 100644
--- a/docs/manual/images/Makefile.am
+++ b/docs/manual/images/Makefile.am
@@ -1,4 +1,4 @@
-fig_pngs= \
+pngfiles= \
 	  bin-element.png \
 	  connected-elements.png \
 	  filter-element-multi.png \
@@ -11,7 +11,7 @@ fig_pngs= \
 	  state-diagram.png \
 	  thread.png
 
-fig_epss= \
+epsfiles= \
 	  bin-element.eps \
 	  connected-elements.eps \
 	  filter-element-multi.eps \
@@ -24,9 +24,6 @@ fig_epss= \
 	  state-diagram.eps \
 	  thread.eps
 
-png_images: $(fig_pngs)
-eps_images: $(fig_epss)
-
 %.png : ../fig/%.fig
 	fig2dev -L png -s 16 $< $@
 
@@ -34,5 +31,8 @@ eps_images: $(fig_epss)
 	fig2dev -L eps -s 16 $< $@
 
 
-all-local: png_images eps_images
+all-local: $(epsfiles)
+
+pngdatadir   = $(datadir)/gstreamer/gstreamer-manual/images
+pngdata_DATA = $(pngfiles)