diff --git a/sflphone-common/doc/Makefile.am b/sflphone-common/doc/Makefile.am
index f742c26ce5b69235cbafa55a31bf5292ffffa0e7..d209eb2c86b8ebbe13e89fbfcf7a52bcc2996736 100644
--- a/sflphone-common/doc/Makefile.am
+++ b/sflphone-common/doc/Makefile.am
@@ -1,5 +1,8 @@
  
-SUBDIRS = doxygen dbus-api
+SUBDIRS = dbus-api
+if ENABLE_DOXYGEN
+    SUBDIRS += doxygen
+endif
 
 .PHONY: doc
 doc:
diff --git a/sflphone-common/doc/doxygen/Makefile.am b/sflphone-common/doc/doxygen/Makefile.am
index 57c36f9880e53b6611515a0961a798e247d67389..3e06d6ea4c002c7c905a43dfb96550be83cc6f07 100644
--- a/sflphone-common/doc/doxygen/Makefile.am
+++ b/sflphone-common/doc/doxygen/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_DOXYGEN
+
 SUBDIRS =
 
 docdir = ${prefix}/share/doc/wifidog-@VERSION@
@@ -53,3 +55,5 @@ maintainer-clean-local: clean-local
             -e 's:@-html_footer-@:${HTML_FOOTER}:g'
 	rm $@.tmp3
 	mv $@.tmp4 $@
+
+endif # ENABLE_DOXYGEN