diff --git a/configure.ac b/configure.ac
index ec5e368fc955c57166e7d80f9ffdb91eb55fdd76..b07bc5ccf138ce263ede685185445b28019e9d81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,8 +36,7 @@ AC_CONFIG_FILES([src/Makefile \
   src/audio/codecs/Makefile
   src/audio/codecs/ilbc/Makefile \
   src/config/Makefile \
-  src/dbus/Makefile \
-  src/zeroconf/Makefile]) 
+  src/dbus/Makefile ]) 
   
   dnl Unitary test section
 AC_CONFIG_FILES([test/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
index 311be41e02e478b31e549bd5a1a2e9c29cc6b65f..b7c1a2839d2f02c089c3c17d24aa359d7c532dfa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,16 +2,6 @@ include ../globals.mak
 
 bin_PROGRAMS = sflphoned
 
-if USE_ZEROCONF
-ZEROCONFDIR = zeroconf
-ZEROCONFLIB = zeroconf/libzeroconf.la
-ZEROCONFFLAGS = -DUSE_ZEROCONF
-else
-ZEROCONFDIR =
-ZEROCONFLIB =
-ZEROCONFFLAGS =  
-endif
-
 if USE_IAX
 # Use the global instead of locally built
 IAX_FLAGS = -DUSE_IAX
@@ -23,7 +13,7 @@ IAXSOURCES =
 IAXHEADERS =
 endif
 
-SUBDIRS = audio config dbus $(ZEROCONFDIR)
+SUBDIRS = audio config dbus
 
 # Add here the cpp files to be build with sflphone
 sflphoned_SOURCES = \
@@ -43,7 +33,6 @@ sflphoned_SOURCES = \
 
 sflphoned_CXXFLAGS = \
 		-DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" \
-		$(ZEROCONFFLAGS) \
 		$(IAX_FLAGS)
 
 
@@ -52,7 +41,6 @@ sflphoned_LDADD = \
 		./libsflphone.la \
 		@CCGNU2_LIBS@ \
 		@CCEXT2_LIBS@ \
-		$(ZEROCONFLIB) \
 		$(IAX_LIBS) \
 		$(PJSIP_LIBS) \
 		@DBUSCPP_LIBS@ \