diff --git a/avrdude/Makefile.am b/avrdude/Makefile.am
index 76d6c6ec..e1884472 100644
--- a/avrdude/Makefile.am
+++ b/avrdude/Makefile.am
@@ -27,8 +27,8 @@ EXTRA_DIST   = \
 	avrdude.spec \
 	bootstrap
 
-SUBDIRS      = @WINDOWS_DIRS@
-DIST_SUBDIRS = windows
+SUBDIRS      = doc @WINDOWS_DIRS@
+DIST_SUBDIRS = doc windows
 
 AM_YFLAGS    = -d
 
diff --git a/avrdude/configure.ac b/avrdude/configure.ac
index 856bac4c..8e73e0b7 100644
--- a/avrdude/configure.ac
+++ b/avrdude/configure.ac
@@ -112,6 +112,7 @@ esac
 AC_SUBST(WINDOWS_DIRS,$WINDOWS_DIRS)
 
 AC_CONFIG_FILES([
+	doc/Makefile
 	windows/Makefile
 	avrdude.spec
 	avrdude.conf
diff --git a/avrdude/doc/Makefile.am b/avrdude/doc/Makefile.am
new file mode 100644
index 00000000..3ef76cb1
--- /dev/null
+++ b/avrdude/doc/Makefile.am
@@ -0,0 +1,34 @@
+#
+# avrdude - A Downloader/Uploader for AVR device programmers
+# Copyright (C) 2003  Theodore A. Roth  <troth@openavr.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+#
+# $Id$
+#
+
+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
+
+clean-local:
+	rm -rf avrdude-html *.info
diff --git a/avrdude/doc/avrdude.texi b/avrdude/doc/avrdude.texi
index 8cb7bce5..f2814254 100644
--- a/avrdude/doc/avrdude.texi
+++ b/avrdude/doc/avrdude.texi
@@ -6,9 +6,14 @@
 @setfilename avrdude.info
 @settitle AVRDUDE
 
-@set UPDATED 26 Febuary 2003
-@set EDITION 3.2.0
-@set VERSION 3.2.0
+@include version.texi
+
+@c
+@c These are set in version.texi which is automatically generated by automake.
+@c
+@c @set UPDATED 26 Febuary 2003
+@c @set EDITION 3.2.0
+@c @set VERSION 3.2.0
 
 @titlepage
 @title AVRDUDE