diff --git a/.gitignore b/.gitignore
index aa87345..126dc79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ src/.deps
 *.o
 synclient
 syndaemon
+*.[0-9]
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..8a58c1f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -25,15 +25,21 @@
 # from the copyright holders.
 # 
 
+synclientmandir = $(APP_MAN_DIR)
+synclientman_PRE = synclient.man
+synclientman_DATA = $(synclientman_PRE:man=@APP_MAN_SUFFIX@)
+
+syndaemonmandir = $(APP_MAN_DIR)
+syndaemonman_PRE = syndaemon.man
+syndaemonman_DATA =$(syndaemonman_PRE:man=@APP_MAN_SUFFIX@)
+
 drivermandir = $(DRIVER_MAN_DIR)
-
 driverman_PRE = @DRIVER_NAME@.man
-
 driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
 
-EXTRA_DIST = @DRIVER_NAME@.man
+EXTRA_DIST = @DRIVER_NAME@.man synclient.man syndaemon.man
 
-CLEANFILES = $(driverman_DATA)
+CLEANFILES = $(driverman_DATA) $(synclientman_DATA) $(syndaemonman_DATA)
 
 SED = sed
 
@@ -57,3 +63,6 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 
 .man.$(DRIVER_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
+.man.$(APP_MAN_SUFFIX):
+	sed $(MAN_SUBSTS) < $< > $@
+
diff --git a/man/synaptics.man b/man/synaptics.man
index 93dc583..d4f5345 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -596,4 +596,4 @@ from the initial position.
 Peter Osterlund <petero2@telia.com> and many others.
 .SH "SEE ALSO"
 .LP
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), synclient(1), syndaemon(1)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), synclient(__appmansuffix__), syndaemon(__appmansuffix__)
diff --git a/man/synclient.1 b/man/synclient.man
similarity index 91%
rename from man/synclient.1
rename to man/synclient.man
index 1159733..a18d169 100644
--- a/man/synclient.1
+++ b/man/synclient.man
@@ -1,8 +1,10 @@
-.TH "synclient" "1" "0.14.6" "" ""
-.SH "NAME"
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH synclient __appmansuffix__ __vendorversion__
+.SH NAME
 .LP
-synclient \- query and modify Synaptics TouchPad driver for
-XOrg/XFree86 server parameters on the fly.
+synclient \- commandline utitlity to query and modify Synaptics driver
+options.
 .SH "SYNTAX"
 .LP
 synclient [\fI\-m interval\fP]
@@ -132,4 +134,4 @@ Peter Osterlund <petero2@telia.com> and many others.
 This man page was written by Mattia Dongili <malattia@debian.org>
 .SH "SEE ALSO"
 .LP
-syndaemon(1), synaptics(5)
+__xservername__(__appmansuffix__), syndaemon(__appmansuffix__), synaptics(__drivermansuffix__)
diff --git a/man/syndaemon.1 b/man/syndaemon.man
similarity index 87%
rename from man/syndaemon.1
rename to man/syndaemon.man
index 9a7729d..b9adc3d 100644
--- a/man/syndaemon.1
+++ b/man/syndaemon.man
@@ -1,5 +1,7 @@
-.TH "syndaemon" "1" "0.14.6" "" ""
-.SH "NAME"
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH syndaemon __appmansuffix__ __vendorversion__
+.SH NAME
 .LP
 syndaemon \- a program that monitors keyboard activity and disables
 the touchpad when the keyboard is being used.
@@ -63,4 +65,4 @@ Peter Osterlund <petero2@telia.com>.
 This man page was written by Mattia Dongili <malattia@debian.org>
 .SH "SEE ALSO"
 .LP
-synclient(1), synaptics(5)
+__xservername__(__appmansuffix__), synclient(__appmansuffix__), synaptics(__drivermansuffix__)