diff --git a/ChangeLog b/ChangeLog
index 24d4ba336..a81e512f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-05 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
+	* doc/Makefile.am: Don't include doc/description/template.desc.
+	into generated HTML files.
+
 2009-03-23  m. allan noah <kitno455 a t gmail d o t com>
 	* backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v20
 	- improved macros for inquiry and set window
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 23e1f8d38..c06582e85 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -185,11 +185,11 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
   descriptions/sm3840.desc descriptions/snapscan.desc descriptions/sp15c.desc \
   descriptions/st400.desc descriptions/stv680.desc descriptions/tamarack.desc \
   descriptions/teco1.desc descriptions/teco2.desc descriptions/teco3.desc \
-  descriptions/template.desc. descriptions/test.desc descriptions/u12.desc \
+  descriptions/test.desc descriptions/u12.desc \
   descriptions/umax1220u.desc descriptions/umax.desc \
   descriptions/umax_pp.desc  descriptions/unsupported.desc \
   descriptions/v4l.desc descriptions/xerox_mfp.desc
-EXTRA_DIST += $(DESC_FILES)
+EXTRA_DIST += $(DESC_FILES) descriptions/template.desc. 
 
 DESC_EXT_FILES = descriptions-external/brother2.desc \
   descriptions-external/brother.desc \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 1466d2e2d..b5b4d21c6 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -266,10 +266,11 @@ EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
 	sane-xerox_mfp.man sane-rts8891.man sane-coolscan3.man \
 	sane.man saned.man descriptions.txt releases.txt \
 	sane-logo2.jpg sane-logo.png sane.png sane.tex net.tex \
-	html.sty $(DESC_FILES) $(DESC_EXT_FILES) figs/area.eps \
-	figs/area.fig figs/flow.eps figs/flow.fig figs/hierarchy.eps \
-	figs/hierarchy.fig figs/image-data.eps figs/image-data.fig \
-	figs/xfer.eps figs/xfer.fig icons/contents.gif icons/index.gif \
+	html.sty $(DESC_FILES) descriptions/template.desc. \
+	$(DESC_EXT_FILES) figs/area.eps figs/area.fig figs/flow.eps \
+	figs/flow.fig figs/hierarchy.eps figs/hierarchy.fig \
+	figs/image-data.eps figs/image-data.fig figs/xfer.eps \
+	figs/xfer.fig icons/contents.gif icons/index.gif \
 	icons/next.gif icons/next_gr.gif icons/previous.gif \
 	icons/previous_gr.gif icons/references.gif \
 	icons/references_gr.gif icons/up.gif icons/up_gr.gif
@@ -370,7 +371,7 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
   descriptions/sm3840.desc descriptions/snapscan.desc descriptions/sp15c.desc \
   descriptions/st400.desc descriptions/stv680.desc descriptions/tamarack.desc \
   descriptions/teco1.desc descriptions/teco2.desc descriptions/teco3.desc \
-  descriptions/template.desc. descriptions/test.desc descriptions/u12.desc \
+  descriptions/test.desc descriptions/u12.desc \
   descriptions/umax1220u.desc descriptions/umax.desc \
   descriptions/umax_pp.desc  descriptions/unsupported.desc \
   descriptions/v4l.desc descriptions/xerox_mfp.desc