diff --git a/doc/Makefile.am b/doc/Makefile.am
index 302fa381..07401b81 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = README ChangeLog $(HTML) $(XML) index.html \
 		export-wiki.sh export-wiki.xsl \
 		generate-man.sh changelog.sh svn2cl.xsl 
 
-HTML= $(shell ls $(srcdir)/*.html $(srcdir)/*.css $(srcdir)/html/*)
+HTML= $(shell ls $(srcdir)/*.html $(srcdir)/*.css $(srcdir)/*.gif $(srcdir)/html/*)
 XML = $(shell ls $(srcdir)/tools/*.xml $(srcdir)/api/*.xml $(srcdir)/api/*/*.xml $(srcdir)/api/api.css $(srcdir)/api/*.xsl)
 
 index.html:
diff --git a/doc/export-wiki.sh b/doc/export-wiki.sh
index 688e4e46..9d0be2c4 100755
--- a/doc/export-wiki.sh
+++ b/doc/export-wiki.sh
@@ -3,7 +3,8 @@
 set -e
 
 export SERVER=http://www.opensc-project.org
-export WIKI=opensc/wiki
+export PROJECT=opensc
+export WIKI=$PROJECT/wiki
 export XSL=export-wiki.xsl
 
 SRCDIR=.
@@ -45,4 +46,16 @@ mv "$SRCDIR"/WikiStart.html "$SRCDIR"/index.html
 wget -nv http://www.opensc-project.org/trac/css/trac.css \
 	-O "$SRCDIR"/trac.css
 
+cat *.html |grep "<img src=\"/$PROJECT/attachment/wiki" \
+	|sed -e 's/.*<img src="\/'$PROJECT'\/attachment\/wiki\/\([^"]*\)?format=raw".*/\1/g' \
+	|sort -u |while read A
+do
+	B="`echo $A |tr / _`"
+	wget -nv "$SERVER/$PROJECT/attachment/wiki/$A?format=raw" -O $B
+	for C in *.html
+	do
+		sed -e 's#\/'$PROJECT'\/attachment\/wiki\/'$A'?format=raw#'$B'#g' -i $C
+	done
+done
+
 rm "$SRCDIR"/*.tmp