diff --git a/ChangeLog b/ChangeLog
index 81bb76601f..305f7572a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  6 12:00:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
+
+	* src/remote_internal.c: Clean up a warning if neither SASL
+	  nor PolKit are enabled.
+
 Thu Dec  6 12:41:18 CET 2007 Jim Meyering <meyering@redhat.com>
 
 	Build also on systems where -lreadline requires e.g., -lncurses.
diff --git a/src/remote_internal.c b/src/remote_internal.c
index 8be86abc78..5a3a63d18a 100644
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -2841,7 +2841,12 @@ remoteNetworkSetAutostart (virNetworkPtr network, int autostart)
 
 static int
 remoteAuthenticate (virConnectPtr conn, struct private_data *priv, int in_open,
-                    virConnectAuthPtr auth, const char *authtype)
+                    virConnectAuthPtr auth
+#if !HAVE_SASL && !HAVE_POLKIT
+                    ATTRIBUTE_UNUSED
+#endif
+                    ,
+                    const char *authtype)
 {
     struct remote_auth_list_ret ret;
     int err, type = REMOTE_AUTH_NONE;