diff --git a/ChangeLog b/ChangeLog
index 021fe50b..95a19b13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-18  Colin Walters  <walters@verbum.org>
+
+	* bus/selinux.c (bus_selinux_enabled): Handle
+	--disable-selinux case.
+	
 2004-10-18  Colin Walters  <walters@verbum.org>
 
 	* bus/selinux.h: Add bus_selinux_enabled.
diff --git a/bus/selinux.c b/bus/selinux.c
index 0946caf9..de68da33 100644
--- a/bus/selinux.c
+++ b/bus/selinux.c
@@ -197,7 +197,11 @@ avc_free_lock (void *lock)
 dbus_bool_t
 bus_selinux_enabled (void)
 {
+#ifdef HAVE_SELINUX
   return selinux_enabled;
+#else
+  return FALSE;
+#endif /* HAVE_SELINUX */
 }
 
 /**