diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e31e8a4f592..c6dd0734e16 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-05  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* net/zeroconf.el (dbus-call-method, dbus-register-signal)
+	(dbus-debug): Move declarations outside eval-when-compile.
+
 2008-05-04  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
 	* proced.el (proced-command-alist): Fix system-type values.  Fix
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el
index a3445ead37d..b3db605403c 100644
--- a/lisp/net/zeroconf.el
+++ b/lisp/net/zeroconf.el
@@ -104,10 +104,11 @@
 ;; disabled with configuration option "--without-dbus".  Declare used
 ;; subroutines and variables of `dbus' therefore.
 (eval-when-compile
-  (require 'cl)
-  (declare-function dbus-call-method "dbusbind.c")
-  (declare-function dbus-register-signal "dbusbind.c")
-  (defvar dbus-debug))
+  (require 'cl))
+
+(declare-function dbus-call-method "dbusbind.c")
+(declare-function dbus-register-signal "dbusbind.c")
+(defvar dbus-debug)
 
 (require 'dbus)