diff --git a/ChangeLog b/ChangeLog
index 4628f42b8..aa8b4c002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 2009-02-18 Julien Blache <jb@jblache.org>
+	* configure.in, configure: raise avahi-client dependency to
+	0.6.24, following a needed bugfix in this release.
 	* backend/net.c: do not lock the Avahi thread before stopping
 	it. It looks like it's no longer necessary to do so.
 	* frontend/saned.c: fix handling of Avahi server restart so it
diff --git a/backend/net.c b/backend/net.c
index f146bbc44..6bbf4395b 100644
--- a/backend/net.c
+++ b/backend/net.c
@@ -922,13 +922,9 @@ net_avahi_cleanup (void)
   if (!avahi_thread)
     return;
 
-  /* Not needed anymore? */
-  /* avahi_threaded_poll_lock (avahi_thread); */
-
   DBG (1, "net_avahi_cleanup: stopping thread\n");
-  avahi_threaded_poll_stop (avahi_thread);
 
-  DBG (1, "net_avahi_cleanup: locking thread\n");
+  avahi_threaded_poll_stop (avahi_thread);
 
   if (avahi_browser)
     avahi_service_browser_free (avahi_browser);
diff --git a/configure b/configure
index 7e423d973..b2f83631a 100755
--- a/configure
+++ b/configure
@@ -9229,12 +9229,12 @@ if test -n "$AVAHI_CFLAGS"; then
     pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.4 \"") >&5
-  ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.4 ") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.24 \"") >&5
+  ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.24 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-client >= 0.6.4 " 2>/dev/null`
+  pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-client >= 0.6.24 " 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -9245,12 +9245,12 @@ if test -n "$AVAHI_LIBS"; then
     pkg_cv_AVAHI_LIBS="$AVAHI_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.4 \"") >&5
-  ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.4 ") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.24 \"") >&5
+  ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.24 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-client >= 0.6.4 " 2>/dev/null`
+  pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-client >= 0.6.24 " 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -9268,9 +9268,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " avahi-client >= 0.6.4 " 2>&1`
+	        AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " avahi-client >= 0.6.24 " 2>&1`
         else
-	        AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors " avahi-client >= 0.6.4 " 2>&1`
+	        AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors " avahi-client >= 0.6.24 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$AVAHI_PKG_ERRORS" >&5
diff --git a/configure.in b/configure.in
index 8c0e49080..98dbdca33 100644
--- a/configure.in
+++ b/configure.in
@@ -133,7 +133,7 @@ AC_ARG_ENABLE(avahi,
 	[enable_avahi=$enableval], [enable_avahi=no])
 
 if test "$enable_avahi" = "yes"; then
-  PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6.4 ],
+  PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6.24 ],
                     [AC_DEFINE(WITH_AVAHI, 1, [define if Avahi support is enabled for saned and the net backend])], enable_avahi=no)
 fi