diff --git a/configure.ac b/configure.ac
index adcd04a4c42282268641b349c66d185a4d397ff1..c23ab188173e75374f496a7efd6183eafe70d707 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,8 @@ AC_CONFIG_FILES([test/Makefile])
 AC_CONFIG_FILES([po/Makefile \
   ringtones/Makefile])
 
+AC_CONFIG_FILES([man/Makefile])
+
 AC_CONFIG_FILES([doc/Makefile \
   doc/doxygen/Makefile])
   
diff --git a/debian/changelog b/debian/changelog
index fde622551d4e18d84739b7113d44fbd9bca5e0e8..a984ee1eae9930da99c0b16d16c410c783117d7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ sflphone (0.9.2-0ubuntu1) hardy; urgency=low
   * Improve spanish translation
   * Migrate to a maintained C++ DBus bindings
   * Clean and improve the build system
+  * Add build-dependency on Perl because we need pod2man to generate manpages
 
  -- Yun Liu <yun.liu@savoirfairelinux.com>  Wed, 26 Nov 2008 09:47:53 -0500
 
diff --git a/debian/control b/debian/control
index 26b48cd438750930bb405f4c644f6b8ec14fc139..e27aa52a287405eee4b7c40ae86dc13687f1f25b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
 Package: sflphone
 Priority: optional
 Architecture: i386
-Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,  libcommoncpp2-1.6-0  , sflphone-iax2, libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11), libcppunit-1.12-0, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-0, libnotify1 (>= 0.4), libsexy2 (>= 0.1) 
+Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,  libcommoncpp2-1.6-0  , sflphone-iax2, libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11), libcppunit-1.12-0, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-0, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8) 
 Homepage: http://www.sflphone.org
 Description: SIP and IAX2 compatible softphone
  SFLphone is meant to be a robust enterprise-class desktop phone.
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000000000000000000000000000000000000..f4c47c0349459fc0ff7559cfe9f8fb3b4212e36b
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1,3 @@
+debian/usr/share/man/man1/sflphone.1
+debian/usr/share/man/man1/sflphoned.1
+debian/usr/share/man/man1/sflphone-gtk.1
diff --git a/debian/rules b/debian/rules
index fcbce980969a6e70e972181a431867dfb6e95bbd..145965e043d4b2cf09ee38f97f694953f7088ca8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ package=sflphone
 
 CXX = g++-4.0
 CFLAGS = -Wall -g
+DEB_INSTALL_MANPAGES_sflphone = sflphoned.1 sflphone.1 sflphone-gtk.1
 
 configure: configure-stamp
 configure-stamp:
@@ -49,7 +50,7 @@ clean:
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp configure-stamp
 	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean 
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..eda99ef08f121d332d4f2c3e945554162123b2ef
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,45 @@
+data_installdir=$(datadir)/man/man1
+
+PODILES=\
+         sflphone-gtk.pod \
+         sflphoned.pod
+
+TFILES=\
+	sflphone.1 \
+	sflphoned.1 \
+	sflphone-gtk.1
+
+PODTOMAN=pod2man
+
+EXTRA_DIST= $(PODFILES)
+
+all:    $(TFILES)
+
+SUFFIXES=.po .mo
+
+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
+
+install-data-local:
+	@catalogs='$(TFILES)'; \
+        for i in $$catalogs; do \
+                destdir=$(data_installdir); \
+                $(mkinstalldirs) $(data_installdir); \
+                $(INSTALL_DATA) $$i $(data_installdir); \
+                echo "installing $$i...done"; \
+        done    
+
+uninstall-local:
+	@catalogs='$(TFILES)'; \
+        for i in $$catalogs; do \
+                destdir=$(data_installdir); \
+                rm -f $(data_installdir)/$$i; \
+                echo "removing $$i "; \
+        done
+
+clean-local:
+	rm -rf *.1
diff --git a/debian/README.manpages b/man/README.manpages
similarity index 100%
rename from debian/README.manpages
rename to man/README.manpages
diff --git a/debian/sflphone-gtk.pod b/man/sflphone-gtk.pod
similarity index 100%
rename from debian/sflphone-gtk.pod
rename to man/sflphone-gtk.pod
diff --git a/debian/sflphoned.pod b/man/sflphoned.pod
similarity index 100%
rename from debian/sflphoned.pod
rename to man/sflphoned.pod