diff --git a/doc/figures/Makefile.am b/doc/figures/Makefile.am
index 540675dd0..d56f4d55a 100644
--- a/doc/figures/Makefile.am
+++ b/doc/figures/Makefile.am
@@ -2,16 +2,21 @@
 
 CLEANFILES = *.pdf *.eps *.ps *.png *.jpg
 
-EXTRA_DIST = architecture.fig libgphoto2-api.fig libgphoto2-camlib.fig libgphoto2_port.fig
+EXTRA_DIST = architecture.fig libgphoto2-api.fig libgphoto2-camlib.fig libgphoto2_port.fig gphotofs.fig
 
-if BUILD_DOC_FIGURES
-all-local: \
-	architecture.jpg libgphoto2-api.jpg libgphoto2-camlib.jpg libgphoto2_port.jpg gphotofs.jpg \
-	architecture.png libgphoto2-api.png libgphoto2-camlib.png libgphoto2_port.png gphotofs.png \
-	architecture.pdf libgphoto2-api.pdf libgphoto2-camlib.pdf libgphoto2_port.pdf gphotofs.pdf \
-	architecture.ps  libgphoto2-api.ps  libgphoto2-camlib.ps  libgphoto2_port.ps  gphotofs.ps  \
-	architecture.eps libgphoto2-api.eps libgphoto2-camlib.eps libgphoto2_port.eps gphotofs.eps
-endif
+figuredir = @HTML_DIR@/figures
+
+if ENABLE_FIGURES
+
+#all-local: \
+#	architecture.jpg libgphoto2-api.jpg libgphoto2-camlib.jpg libgphoto2_port.jpg gphotofs.jpg \
+#	architecture.png libgphoto2-api.png libgphoto2-camlib.png libgphoto2_port.png gphotofs.png \
+#	architecture.pdf libgphoto2-api.pdf libgphoto2-camlib.pdf libgphoto2_port.pdf gphotofs.pdf \
+#	architecture.ps  libgphoto2-api.ps  libgphoto2-camlib.ps  libgphoto2_port.ps  gphotofs.ps  \
+#	architecture.eps libgphoto2-api.eps libgphoto2-camlib.eps libgphoto2_port.eps gphotofs.eps
+
+figure_DATA = architecture.png libgphoto2-api.png libgphoto2-camlib.png libgphoto2_port.png gphotofs.png \
+	architecture.jpg libgphoto2-api.jpg libgphoto2-camlib.jpg libgphoto2_port.jpg gphotofs.jpg
 
 %.eps: %.fig
 	fig2dev -L eps $< $@
@@ -29,3 +34,10 @@ endif
 	fig2dev -L jpeg -m 1.5 $< $@
 
 %.pdf: %.ps
+
+else
+
+all-local:
+	@echo "Dummy target $@"
+
+endif