=== modified file '.bzrignore'
--- .bzrignore	2008-09-26 05:04:15 +0000
+++ .bzrignore	2008-09-30 07:23:39 +0000
@@ -5,6 +5,7 @@
 debian/po/messages.mo
 debian/po/templates.pot
 keydir
+man
 plugin-runner
 plugins.d/mandos-client
 plugins.d/password-prompt

=== modified file 'Makefile'
--- Makefile	2008-09-30 03:19:39 +0000
+++ Makefile	2008-09-30 07:23:39 +0000
@@ -13,6 +13,9 @@
 #COVERAGE=--coverage
 OPTIMIZE=-Os
 LANGUAGE=-std=gnu99
+htmldir=man
+version=1.0
+SED=sed
 
 ## Use these settings for a traditional /usr/local install
 # PREFIX=$(DESTDIR)/usr/local
@@ -39,7 +42,8 @@
 
 # Do not change these two
 CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
-	$(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
+	$(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
+	-DVERSION='"$(version)"'
 LDFLAGS=$(COVERAGE)
 
 # Commands to format a DocBook <refentry> document into a manual page
@@ -53,7 +57,7 @@
 	$(notdir $<); \
 	$(MANPOST) $(notdir $@)
 # DocBook-to-man post-processing to fix a '\n' escape bug
-MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
+MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
 DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 	--param make.year.ranges		1 \
@@ -65,11 +69,12 @@
 	/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
 	$<; $(HTMLPOST) $@
 # Fix citerefentry links
-HTMLPOST=sed --in-place --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
+HTMLPOST=$(SED) --in-place --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
 PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 	plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
-PROGS=plugin-runner $(PLUGINS)
+CPROGS=plugin-runner $(PLUGINS)
+PROGS=mandos mandos-keygen $(CPROGS)
 DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 	plugins.d/mandos-client.8mandos \
 	plugins.d/password-prompt.8mandos mandos.conf.5 \
@@ -77,7 +82,7 @@
 
 htmldocs=$(addsuffix .xhtml,$(DOCS))
 
-objects=$(addsuffix .o,$(PROGS))
+objects=$(addsuffix .o,$(CPROGS))
 
 all: $(PROGS)
 
@@ -85,52 +90,70 @@
 
 html: $(htmldocs)
 
-%.5: %.xml legalnotice.xml
-	$(DOCBOOKTOMAN)
-%.5.xhtml: %.xml legalnotice.xml
-	$(DOCBOOKTOHTML)
-
-%.8: %.xml legalnotice.xml
-	$(DOCBOOKTOMAN)
-%.8.xhtml: %.xml legalnotice.xml
-	$(DOCBOOKTOHTML)
-
-%.8mandos: %.xml legalnotice.xml
-	$(DOCBOOKTOMAN)
-%.8mandos.xhtml: %.xml legalnotice.xml
-	$(DOCBOOKTOHTML)
-
-mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
-	$(DOCBOOKTOMAN)
-mandos.8.xhtml: mandos.xml mandos-options.xml overview.xml \
-		legalnotice.xml
-	$(DOCBOOKTOHTML)
-
-mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
-	$(DOCBOOKTOMAN)
-mandos-keygen.8.xhtml: mandos-keygen.xml overview.xml legalnotice.xml
-	$(DOCBOOKTOHTML)
-
-mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
-	$(DOCBOOKTOMAN)
-mandos.conf.5.xhtml: mandos.conf.xml mandos-options.xml legalnotice.xml
-	$(DOCBOOKTOHTML)
-
-plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
-	$(DOCBOOKTOMAN)
-plugin-runner.8mandos.xhtml: plugin-runner.xml overview.xml \
-		legalnotice.xml
+%.5: %.xml common.ent legalnotice.xml
+	$(DOCBOOKTOMAN)
+%.5.xhtml: %.xml common.ent legalnotice.xml
+	$(DOCBOOKTOHTML)
+
+%.8: %.xml common.ent legalnotice.xml
+	$(DOCBOOKTOMAN)
+%.8.xhtml: %.xml common.ent legalnotice.xml
+	$(DOCBOOKTOHTML)
+
+%.8mandos: %.xml common.ent legalnotice.xml
+	$(DOCBOOKTOMAN)
+%.8mandos.xhtml: %.xml common.ent legalnotice.xml
+	$(DOCBOOKTOHTML)
+
+mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
+		legalnotice.xml
+	$(DOCBOOKTOMAN)
+mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
+		overview.xml legalnotice.xml
+	$(DOCBOOKTOHTML)
+
+mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
+		legalnotice.xml
+	$(DOCBOOKTOMAN)
+mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
+		 legalnotice.xml
+	$(DOCBOOKTOHTML)
+
+mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
+		legalnotice.xml
+	$(DOCBOOKTOMAN)
+mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
+		legalnotice.xml
+	$(DOCBOOKTOHTML)
+
+plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
+		legalnotice.xml
+	$(DOCBOOKTOMAN)
+plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
+		overview.xml legalnotice.xml
 	$(DOCBOOKTOHTML)
 
 plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
+					common.ent \
 					mandos-options.xml \
 					overview.xml legalnotice.xml
 	$(DOCBOOKTOMAN)
 plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
+					common.ent \
 					mandos-options.xml \
 					overview.xml legalnotice.xml
 	$(DOCBOOKTOHTML)
 
+# Update all these files with version number $(version)
+common.ent: Makefile
+	$(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
+
+mandos: Makefile
+	$(SED) --in-place --expression='s/^\(version = "\)[^"]*"/\1$(version)"/' $@
+
+mandos-keygen: Makefile
+	$(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"/\1$(version)"/' $@
+
 plugins.d/mandos-client: plugins.d/mandos-client.o
 	$(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 		$(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
@@ -140,14 +163,14 @@
 	uninstall-client purge purge-server purge-client
 
 clean:
-	-rm --force $(PROGS) $(objects) $(htmldocs) $(DOCS) core
+	-rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
 
 distclean: clean
 mostlyclean: clean
 maintainer-clean: clean
 	-rm --force --recursive keydir confdir
 
-check:
+check:	all
 	./mandos --check
 
 # Run the client with a local config and key
@@ -178,8 +201,9 @@
 install: install-server install-client-nokey
 
 install-html: $(htmldocs)
-	install --directory man
-	install --mode=u=rw,go=r --target-directory=man $(htmldocs)
+	install --directory $(htmldir)
+	install --mode=u=rw,go=r --target-directory=$(htmldir) \
+		$(htmldocs)
 
 install-server: doc
 	install --directory $(CONFDIR)

=== added file 'common.ent'
--- common.ent	1970-01-01 00:00:00 +0000
+++ common.ent	2008-09-30 07:23:39 +0000
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Edited by Makefile -->
+<!ENTITY version "1.0">

=== modified file 'mandos-clients.conf.xml'
--- mandos-clients.conf.xml	2008-09-12 19:12:40 +0000
+++ mandos-clients.conf.xml	2008-09-30 07:23:39 +0000
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY VERSION "1.0">
 <!ENTITY CONFNAME "mandos-clients.conf">
 <!ENTITY CONFPATH "<filename>/etc/mandos/clients.conf</filename>">
-<!ENTITY TIMESTAMP "2008-09-12">
+<!ENTITY TIMESTAMP "2008-09-30">
+<!ENTITY % common SYSTEM "common.ent">
+%common;
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -12,7 +13,7 @@
     <title>Mandos Manual</title>
     <!-- NWalsh’s docbook scripts use this to generate the footer: -->
     <productname>Mandos</productname>
-    <productnumber>&VERSION;</productnumber>
+    <productnumber>&version;</productnumber>
     <date>&TIMESTAMP;</date>
     <authorgroup>
       <author>

=== modified file 'mandos-keygen.xml'
--- mandos-keygen.xml	2008-09-19 23:31:34 +0000
+++ mandos-keygen.xml	2008-09-30 07:23:39 +0000
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "mandos-keygen">
-<!ENTITY TIMESTAMP "2008-09-20">
+<!ENTITY TIMESTAMP "2008-09-30">
+<!ENTITY % common SYSTEM "common.ent">
+%common;
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -11,7 +12,7 @@
     <title>Mandos Manual</title>
     <!-- NWalsh’s docbook scripts use this to generate the footer: -->
     <productname>Mandos</productname>
-    <productnumber>&VERSION;</productnumber>
+    <productnumber>&version;</productnumber>
     <date>&TIMESTAMP;</date>
     <authorgroup>
       <author>

=== modified file 'mandos.conf.xml'
--- mandos.conf.xml	2008-09-12 19:12:40 +0000
+++ mandos.conf.xml	2008-09-30 07:23:39 +0000
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY VERSION "1.0">
 <!ENTITY CONFNAME "mandos.conf">
 <!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
-<!ENTITY TIMESTAMP "2008-09-12">
+<!ENTITY TIMESTAMP "2008-09-30">
+<!ENTITY % common SYSTEM "common.ent">
+%common;
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -12,7 +13,7 @@
     <title>Mandos Manual</title>
     <!-- NWalsh’s docbook scripts use this to generate the footer: -->
     <productname>Mandos</productname>
-    <productnumber>&VERSION;</productnumber>
+    <productnumber>&version;</productnumber>
     <date>&TIMESTAMP;</date>
     <authorgroup>
       <author>

=== modified file 'mandos.xml'
--- mandos.xml	2008-09-21 12:20:55 +0000
+++ mandos.xml	2008-09-30 07:23:39 +0000
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "mandos">
-<!ENTITY TIMESTAMP "2008-09-21">
+<!ENTITY TIMESTAMP "2008-09-30">
+<!ENTITY % common SYSTEM "common.ent">
+%common;
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
-  <refentryinfo>
+   <refentryinfo>
     <title>Mandos Manual</title>
     <!-- NWalsh’s docbook scripts use this to generate the footer: -->
     <productname>Mandos</productname>
-    <productnumber>&VERSION;</productnumber>
+    <productnumber>&version;</productnumber>
     <date>&TIMESTAMP;</date>
     <authorgroup>
       <author>

=== modified file 'plugin-runner.c'
--- plugin-runner.c	2008-09-26 04:54:35 +0000
+++ plugin-runner.c	2008-09-30 07:23:39 +0000
@@ -69,7 +69,7 @@
 #define PDIR "/lib/mandos/plugins.d"
 #define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
 
-const char *argp_program_version = "plugin-runner 1.0";
+const char *argp_program_version = "plugin-runner " VERSION;
 const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
 
 typedef struct plugin{

=== modified file 'plugin-runner.xml'
--- plugin-runner.xml	2008-09-19 00:00:51 +0000
+++ plugin-runner.xml	2008-09-30 07:23:39 +0000
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "plugin-runner">
-<!ENTITY TIMESTAMP "2008-09-19">
+<!ENTITY TIMESTAMP "2008-09-30">
+<!ENTITY % common SYSTEM "common.ent">
+%common;
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -11,7 +12,7 @@
     <title>Mandos Manual</title>
     <!-- Nwalsh’s docbook scripts use this to generate the footer: -->
     <productname>Mandos</productname>
-    <productnumber>&VERSION;</productnumber>
+    <productnumber>&version;</productnumber>
     <date>&TIMESTAMP;</date>
     <authorgroup>
       <author>

=== modified file 'plugins.d/mandos-client.c'
--- plugins.d/mandos-client.c	2008-09-19 20:42:17 +0000
+++ plugins.d/mandos-client.c	2008-09-30 07:23:39 +0000
@@ -101,17 +101,13 @@
 
 #define BUFFER_SIZE 256
 
-/*
-  #define PATHDIR "/conf/conf.d/mandos"
-*/
-
 #define PATHDIR "/conf/conf.d/mandos"
 #define SECKEY "seckey.txt"
 #define PUBKEY "pubkey.txt"
 
 bool debug = false;
 static const char mandos_protocol_version[] = "1";
-const char *argp_program_version = "mandos-client 1.0";
+const char *argp_program_version = "mandos-client " VERSION;
 const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
 
 /* Used for passing in values through the Avahi callback functions */

=== modified file 'plugins.d/mandos-client.xml'
--- plugins.d/mandos-client.xml	2008-09-30 03:19:39 +0000
+++ plugins.d/mandos-client.xml	2008-09-30 07:23:39 +0000
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "mandos-client">
 <!ENTITY TIMESTAMP "2008-09-30">
+<!ENTITY % common SYSTEM "../common.ent">
+%common;
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
   <refentryinfo>
     <title>Mandos Manual</title>
-    <!-- Nwalsh’s docbook scripts use this to generate the footer: -->
+    <!-- NWalsh’s docbook scripts use this to generate the footer: -->
     <productname>Mandos</productname>
-    <productnumber>&VERSION;</productnumber>
+    <productnumber>&version;</productnumber>
     <date>&TIMESTAMP;</date>
     <authorgroup>
       <author>

=== modified file 'plugins.d/password-prompt.c'
--- plugins.d/password-prompt.c	2008-09-19 20:42:17 +0000
+++ plugins.d/password-prompt.c	2008-09-30 07:23:39 +0000
@@ -52,7 +52,7 @@
 
 volatile bool quit_now = false;
 bool debug = false;
-const char *argp_program_version = "password-prompt 1.0";
+const char *argp_program_version = "password-prompt " VERSION;
 const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
 
 static void termination_handler(__attribute__((unused))int signum){

=== modified file 'plugins.d/password-prompt.xml'
--- plugins.d/password-prompt.xml	2008-09-06 16:31:49 +0000
+++ plugins.d/password-prompt.xml	2008-09-30 07:23:39 +0000
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "password-prompt">
-<!ENTITY TIMESTAMP "2008-09-06">
+<!ENTITY TIMESTAMP "2008-09-30">
+<!ENTITY % common SYSTEM "../common.ent">
+%common;
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -11,7 +12,7 @@
     <title>Mandos Manual</title>
     <!-- NWalsh’s docbook scripts use this to generate the footer: -->
     <productname>Mandos</productname>
-    <productnumber>&VERSION;</productnumber>
+    <productnumber>&version;</productnumber>
     <date>&TIMESTAMP;</date>
     <authorgroup>
       <author>