diff --git a/doc/ChangeLog b/doc/ChangeLog
index f9f44c6e4..60b15d956 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-08  Werner Koch  <wk@g10code.com>
+
+	* gnupg.texi: Moved the logo for HTML more to the top.
+	* Makefile.am (install-html-local): New.
+	(DVIPS): Redefine to include srcdir.
+
 2007-05-04  Werner Koch  <wk@g10code.com>
 
 	* gnupg.texi (Top): Fix typo and a grammar issue.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 105a3695b..91f52974e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -44,6 +44,8 @@ gnupg_TEXINFOS = \
 	tools.texi debugging.texi glossary.texi contrib.texi gpl.texi \
 	sysnotes.texi gnupg-card-architecture.fig
 
+DVIPS = TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" dvips
+
 AM_MAKEINFOFLAGS = -I $(srcdir) --css-include=$(srcdir)/texi.css
 
 YAT2M_OPTIONS = -I $(srcdir) \
@@ -132,6 +134,8 @@ $(myman_pages) gnupg.7 : yat2m-stamp
 gnupg.texi : $(gnupg_TEXINFOS)
 	touch $(srcdir)/gnupg.texi
 
+install-html-local:
+	cp $(srcdir)/gnupg-logo.png gnupg.html/
 
 online: gnupg.html gnupg.pdf
 	set -e; \
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index 9e24cab6b..415724b1a 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -104,6 +104,10 @@ section entitled ``Copying''.
 @page
 @end ifnothtml
 
+@ifhtml
+@center @image{gnupg-logo,6cm,,The GnuPG Logo}
+@end ifhtml
+
 @ifnottex
 @node Top
 @top 
@@ -136,12 +140,6 @@ the administration and the architecture.
 * Index::	        Index of concepts and symbol names.
 @end menu
 
-@ifhtml
-
-@center @image{gnupg-logo,6cm,,The GnuPG Logo}
-
-@end ifhtml
-
 
 @ifhtml
 @page