diff --git a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
index 7041f4207742726f7ae8f8207a6518eac2b4dde2..3be078346747466a2289f0dfe83263977b08285f 100755
--- a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
+++ b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
@@ -627,7 +627,7 @@
 		   </arg>
 	   </method>
 
-	   <method name="setAudioRingtoneDevice" tp:name-for-binding="setAudioRingtoneDevice">
+	   <method name="setAudioRingtoneDevice" tp:name-for-bindings="setAudioRingtoneDevice">
 	           <tp:docstring>
 		   </tp:docstring>
 		   <arg type="i" name="index" direction="in">
@@ -688,7 +688,7 @@
 		   </arg>
 	   </method>
 
-	   <method name="setNoiseSuppressState" tp:name-for-binding="setNoiseSuppressState">
+	   <method name="setNoiseSuppressState" tp:name-for-bindings="setNoiseSuppressState">
 	           <arg type="s" name="state" direction="in">
 	           </arg>
 	   </method>
@@ -702,12 +702,12 @@
 		   </arg>
 	   </method>
 
-	   <method name="setEchoCancelState" tp:name-for-binding="setEchoCancelState">
+	   <method name="setEchoCancelState" tp:name-for-bindings="setEchoCancelState">
 	           <arg type="s" name="state" direction="in">
 	           </arg>
 	   </method>
 
-	   <method name="setEchoCancelTailLength" tp:name-for-binding="setEchoCancelTailLength">
+	   <method name="setEchoCancelTailLength" tp:name-for-bindings="setEchoCancelTailLength">
 	           <tp:docstring>
 		   </tp:docstring>
 		   <arg type="i" name="index" direction="in">
@@ -716,7 +716,7 @@
 		   </arg>
 	   </method>
 	   
-	   <method name="getEchoCancelTailLength" tp:name-for-binding="getEchoCancelTailLength">
+	   <method name="getEchoCancelTailLength" tp:name-for-bindings="getEchoCancelTailLength">
 	           <tp:docstring>
 		   </tp:docstring>
 		   <arg type="i" name="index" direction="out">
@@ -725,14 +725,14 @@
 		   </arg>
 	   </method>
 	   
-	   <method name="setEchoCancelDelay" tp:name-for-binding="setEchoCancelTailLength">
+	   <method name="setEchoCancelDelay" tp:name-for-bindings="setEchoCancelDelay">
 	       <tp:docstring>
 	       </tp:docstring>
 	       <arg type="i" name="index" direction="in">
 	       </arg>
 	   </method> 
 	   
-	   <method name="getEchoCancelDelay" tp:name-for-binding="getEchoCancelTailLength">
+	   <method name="getEchoCancelDelay" tp:name-for-bindings="getEchoCancelDelay">
 	       <tp:docstring>
 	       </tp:docstring>
 	       <arg type="i" name="index" direction="out">
diff --git a/sflphone-common/Makefile.am b/sflphone-common/Makefile.am
index c06b61eb6fff2a4b8a63de7e83f420254de03593..4fa6a7d84baf7f50e131b627b0399566c1f0196b 100644
--- a/sflphone-common/Makefile.am
+++ b/sflphone-common/Makefile.am
@@ -18,13 +18,8 @@ unittest:
 	@echo " -- You need the cppunit devel package to compile the unitary tests."
 endif
 
-doc:
-	@(cd doc; make)
-	@echo ""
-	@echo "D-Bus API HTML documentation has been generated in doc/dbus-api/doc/spec"
-	@echo ""
-
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libs src ringtones man $(TESTS_DIR)
+SUBDIRS = libs src ringtones man $(TESTS_DIR) doc
+
 EXTRA_DIST = m4/*.m4 images/* README.gentoo
 
diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index ea3857c9ec76e23095129df02fa07a5e667b0e8f..e182c471685cee659629d74940676f25278f9ee1 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -420,36 +420,14 @@ AC_DEFUN([BB_ENABLE_DOXYGEN],
 		[
 		AC_ARG_ENABLE(doxygen, [  --enable-doxygen        enable documentation generation with doxygen (auto)])
 		AC_ARG_ENABLE(dot, [  --enable-dot            use 'dot' to generate graphs in doxygen (auto)])              
-		AC_ARG_ENABLE(html-docs, [  --enable-html-docs      enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes])              
-		AC_ARG_ENABLE(latex-docs, [  --enable-latex-docs     enable LaTeX documentation generation with doxygen (no)], [], [ enable_latex_docs=no])              
-		if test "x$enable_doxygen" = xno; then
-		enable_doc=no
-		else 
+		if test "x$enable_doxygen" != xno; then
 		AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
-		if test x$DOXYGEN = x; then
-		if test "x$enable_doxygen" = xyes; then
-		AC_MSG_ERROR([could not find doxygen])
-		fi
-		enable_doc=no
-		else
-		enable_doc=yes
+		test x$DOXYGEN = x -a "x$enable_doxygen" = xyes && AC_MSG_ERROR([could not find doxygen])
 		AC_PATH_PROG(DOT, dot, , $PATH)
 		fi
-		fi
-		AM_CONDITIONAL(DOC, test x$enable_doc = xyes)
+        AM_CONDITIONAL(ENABLE_DOXYGEN, test x$DOXYGEN != x)
 
-	if test x$DOT = x; then
-	if test "x$enable_dot" = xyes; then
-	AC_MSG_ERROR([could not find dot])
-	fi
-	enable_dot=no
-	else
-	enable_dot=yes
-	fi
-	AM_CONDITIONAL(ENABLE_DOXYGEN, test x$enable_doc = xtrue)
-	AC_SUBST(enable_dot)
-	AC_SUBST(enable_html_docs)
-	AC_SUBST(enable_latex_docs)
+	test x$DOT = x -a "x$enable_dot" = xyes && AC_MSG_ERROR([could not find dot])
 	])
 	# Acutally perform the doxygen check
 	BB_ENABLE_DOXYGEN
diff --git a/sflphone-common/doc/doxygen/Makefile.am b/sflphone-common/doc/doxygen/Makefile.am
index 3e06d6ea4c002c7c905a43dfb96550be83cc6f07..af495b20c81ea8147e0f6c56154ec461e3e22a27 100644
--- a/sflphone-common/doc/doxygen/Makefile.am
+++ b/sflphone-common/doc/doxygen/Makefile.am
@@ -14,7 +14,7 @@ all: doxygen-trac
 doxygen-trac: clean core-doc-trac gtk-gui-doc-trac
 
 %-doc-trac : %-doc
-	ln -s ${html_parent_dir}/$< ${html_parent_dir}/$</html
+	ln -sf ${html_parent_dir}/$< ${html_parent_dir}/$</html
 
 doc: clean core-doc gtk-gui-doc
 
diff --git a/sflphone-common/src/dbus/configurationmanager-introspec.xml b/sflphone-common/src/dbus/configurationmanager-introspec.xml
index 7041f4207742726f7ae8f8207a6518eac2b4dde2..25fc4ff05d961a47eb2f949e5ade4894f87a3330 100755
--- a/sflphone-common/src/dbus/configurationmanager-introspec.xml
+++ b/sflphone-common/src/dbus/configurationmanager-introspec.xml
@@ -627,8 +627,8 @@
 		   </arg>
 	   </method>
 
-	   <method name="setAudioRingtoneDevice" tp:name-for-binding="setAudioRingtoneDevice">
-	           <tp:docstring>
+	   <method name="setAudioRingtoneDevice" tp:name-for-bindings="setAudioRingtoneDevice">
+	       <tp:docstring>
 		   </tp:docstring>
 		   <arg type="i" name="index" direction="in">
 		     <tp:docstring>
@@ -688,8 +688,12 @@
 		   </arg>
 	   </method>
 
-	   <method name="setNoiseSuppressState" tp:name-for-binding="setNoiseSuppressState">
+	   <method name="setNoiseSuppressState" tp:name-for-bindings="setNoiseSuppressState">
+	           <tp:docstring>
+		   </tp:docstring>
 	           <arg type="s" name="state" direction="in">
+	           <tp:docstring>
+		   </tp:docstring>
 	           </arg>
 	   </method>
 	   
@@ -702,12 +706,12 @@
 		   </arg>
 	   </method>
 
-	   <method name="setEchoCancelState" tp:name-for-binding="setEchoCancelState">
+	   <method name="setEchoCancelState" tp:name-for-bindings="setEchoCancelState">
 	           <arg type="s" name="state" direction="in">
 	           </arg>
 	   </method>
 
-	   <method name="setEchoCancelTailLength" tp:name-for-binding="setEchoCancelTailLength">
+	   <method name="setEchoCancelTailLength" tp:name-for-bindings="setEchoCancelTailLength">
 	           <tp:docstring>
 		   </tp:docstring>
 		   <arg type="i" name="index" direction="in">
@@ -716,7 +720,7 @@
 		   </arg>
 	   </method>
 	   
-	   <method name="getEchoCancelTailLength" tp:name-for-binding="getEchoCancelTailLength">
+	   <method name="getEchoCancelTailLength" tp:name-for-bindings="getEchoCancelTailLength">
 	           <tp:docstring>
 		   </tp:docstring>
 		   <arg type="i" name="index" direction="out">
@@ -725,14 +729,14 @@
 		   </arg>
 	   </method>
 	   
-	   <method name="setEchoCancelDelay" tp:name-for-binding="setEchoCancelTailLength">
+	   <method name="setEchoCancelDelay" tp:name-for-bindings="setEchoCancelDelay">
 	       <tp:docstring>
 	       </tp:docstring>
 	       <arg type="i" name="index" direction="in">
 	       </arg>
 	   </method> 
 	   
-	   <method name="getEchoCancelDelay" tp:name-for-binding="getEchoCancelTailLength">
+	   <method name="getEchoCancelDelay" tp:name-for-bindings="getEchoCancelDelay">
 	       <tp:docstring>
 	       </tp:docstring>
 	       <arg type="i" name="index" direction="out">