diff --git a/ChangeLog b/ChangeLog
index 3dc57bac74..0cc4bcc525 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-15  John (J5) Palmieri <johnp@redhat.com>
+
+	* info-daemon/NetworkManagerInfo.conf
+		- Created a more robust security policy for the DBus service
+			- everything is denied by default
+			- root can own and send to the service
+			- users logged in at the console can send to the service
+
 2004-09-13  Dan Williams <dcbw@redhat.com>
 
 	* src/NetworkManagerDevice.c
diff --git a/info-daemon/NetworkManagerInfo.conf b/info-daemon/NetworkManagerInfo.conf
index 153b697708..bf60884fdb 100644
--- a/info-daemon/NetworkManagerInfo.conf
+++ b/info-daemon/NetworkManagerInfo.conf
@@ -2,11 +2,21 @@
  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
-	<policy context="default">
+	<policy user="root">
 		<allow own="org.freedesktop.NetworkManagerInfo"/>
 
 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-		<allow send_interface="org.freedesktop.NetworkManagerInfo"/>
+                <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
+	</policy>
+	<policy at_console="true">
+		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
+                <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
+	</policy>
+	<policy context="default">
+		<deny own="org.freedesktop.NetworkManagerInfo"/>
+
+		<deny send_destination="org.freedesktop.NetworkManagerInfo"/>
+		<deny send_interface="org.freedesktop.NetworkManagerInfo"/>
 	</policy>
 </busconfig>