diff --git a/man/Makefile.am b/man/Makefile.am
index eda99ef08f121d332d4f2c3e945554162123b2ef..736e7c2299ffa2e9fe70c83a0c24bde0807123c5 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,31 +1,30 @@
 data_installdir=$(datadir)/man/man1
 
-PODILES=\
+SECTION="1"
+RELEASE_VERSION="0.9.2"
+
+TEMPLATES=\
          sflphone-gtk.pod \
          sflphoned.pod
 
-TFILES=\
+MANPAGES=\
 	sflphone.1 \
 	sflphoned.1 \
 	sflphone-gtk.1
 
-PODTOMAN=pod2man
+POD2MAN=pod2man
 
-EXTRA_DIST= $(PODFILES)
+EXTRA_DIST= $(MANPAGES)
 
-all:    $(TFILES)
+all:    $(MANPAGES)
 
-SUFFIXES=.po .mo
+SUFFIXES=.pod .1
 
-sflphone.1:
-	pod2man --section=1 --release="0.9.2" --center "" sflphone-gtk.pod > sflphone.1
-sflphoned.1:
-	pod2man --section=1 --release="0.9.2" --center "" sflphoned.pod > sflphoned.1
-sflphone-gtk.1:
-	pod2man --section=1 --release="0.9.2" --center "" sflphone-gtk.pod > sflphone-gtk.1
+.pod.1:
+	$(POD2MAN) --section=$(SECTION) --release=$(RELEASE_VERSION) --center "" $< > $@ 
 
 install-data-local:
-	@catalogs='$(TFILES)'; \
+	@catalogs='$(MANPAGES)'; \
         for i in $$catalogs; do \
                 destdir=$(data_installdir); \
                 $(mkinstalldirs) $(data_installdir); \
@@ -34,7 +33,7 @@ install-data-local:
         done    
 
 uninstall-local:
-	@catalogs='$(TFILES)'; \
+	@catalogs='$(MANPAGES)'; \
         for i in $$catalogs; do \
                 destdir=$(data_installdir); \
                 rm -f $(data_installdir)/$$i; \
diff --git a/man/sflphone-gtk.pod b/man/sflphone-gtk.pod
index c4609ee8b1ad2d3bba47299c43495e0926a05266..6e08e5fa23c1acfbcd478f45205ceec686ba7c1f 100644
--- a/man/sflphone-gtk.pod
+++ b/man/sflphone-gtk.pod
@@ -22,6 +22,10 @@ B<sflphoned> is developed in Montreal by Savoir-Faire Linux Inc. The active deve
 
 This manual page was written by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>.
 
+=head1 SEE ALSO
+
+B<sflphoned>(1)
+
 =head1 COPYRIGHT
 
 This program is free software; you can redistribute it and/or modify it
diff --git a/man/sflphone.pod b/man/sflphone.pod
new file mode 100644
index 0000000000000000000000000000000000000000..6e08e5fa23c1acfbcd478f45205ceec686ba7c1f
--- /dev/null
+++ b/man/sflphone.pod
@@ -0,0 +1,39 @@
+=head1 NAME
+
+sflphone-gtk - SIP and IAX2 compatible voice over IP softphone GTK+ client.
+
+=head1 SYNOPSIS
+
+sflphone-gtk 
+
+=head1 DESCRIPTION
+
+SFLphone is meant to be a robust enterprise-class desktop phone. It provides functions like call transfer, call hold, multiple lines, multiple accounts support.
+SFLphone audio layer is build upon a native ALSA interface and and a native PulseAudio interface.
+B<sflphone-gtk> is a GTK+ client for SFLphone; it communicates with the core side through DBus. SFLphone package comes with the core, B<sflphoned>.
+
+=head1 BUGS
+
+Please report bugs  at http://dev.savoirfairelinux.net/sflphone/newticket.
+
+=head1 AUTHORS
+
+B<sflphoned> is developed in Montreal by Savoir-Faire Linux Inc. The active developers are Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> and Yun Liu <yun.liu@savoirfairelinux.com>.
+
+This manual page was written by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>.
+
+=head1 SEE ALSO
+
+B<sflphoned>(1)
+
+=head1 COPYRIGHT
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3 as published by the
+Free Software Foundation.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+=cut
+
diff --git a/man/sflphoned.pod b/man/sflphoned.pod
index 21f77435752d19a3f1883875452ac88d15798567..b1b739566a4ce9fdd5527756515e0ab179a85ab4 100644
--- a/man/sflphoned.pod
+++ b/man/sflphoned.pod
@@ -22,6 +22,10 @@ B<sflphoned> is developed in Montreal by Savoir-Faire Linux Inc. The active deve
 
 This manual page was written by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>.
 
+=head1 SEE ALSO
+
+B<sflphone>(1), B<sflphone-gtk>(1)
+
 =head1 COPYRIGHT
 
 This program is free software; you can redistribute it and/or modify it