diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog
index 31e995f0..7b411aea 100644
--- a/avrdude/ChangeLog
+++ b/avrdude/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-16  Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* doc/Makefile.am: add logic to detect the misf^H^H^H^H
+	gratitous API change in recent versions of texi2html where
+	the output directory has changed names.
+	Fix for:
+	bug #13026: The build fails with texi2html 1.76
+	bug #12715: make issues during install
+	patch #3091: commandline fix for latest version of texi2html
+
 2005-09-16  Joerg Wunsch <j@uriah.heep.sax.de>
 
 	* usb_libusb.c (usbdev_drain): actually implement draining to aid
diff --git a/avrdude/doc/Makefile.am b/avrdude/doc/Makefile.am
index da00db63..69e0276a 100644
--- a/avrdude/doc/Makefile.am
+++ b/avrdude/doc/Makefile.am
@@ -30,9 +30,14 @@ info_TEXINFOS = avrdude.texi
 all-local: info html ps pdf
 
 html: 
-	mkdir -p avrdude-html
 	texi2html -split_node $(srcdir)/$(info_TEXINFOS)
-	mv *.html avrdude-html
+	if [ -e ./avrdude.html ]; then \
+	 mkdir -p avrdude-html; \
+	 mv *.html avrdude-html ; \
+	else \
+	 mv avrdude avrdude-html; \
+	fi;
+	
 
 clean-local:
 	rm -rf avrdude-html *.info