diff --git a/ChangeLog b/ChangeLog
index faa27fc77f..ccca34afc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-10-15 Dan Williams <dcbw@redhat.com>
+
+	---- We have a website ----
+	http://people.redhat.com/dcbw/NetworkManager
+
+	Patch from Robert Paskowitz:
+	* src/NetworkManager.c
+		- (main): Make sure we are run as root
+	* src/NetworkManagerDevice.c
+		- Fix type in ad-hoc setting function
+
+	Patch from Thom May:
+	* src/backends/NetworkManagerDebian.c
+		- Make Debian backend compile again
+
 2004-10-14 Dan Williams <dcbw@redhat.com>
 
 	* Tagged NetworkManager-0_3
diff --git a/src/NetworkManager.c b/src/NetworkManager.c
index 3221df45bb..2b93474221 100644
--- a/src/NetworkManager.c
+++ b/src/NetworkManager.c
@@ -30,6 +30,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include "NetworkManager.h"
 #include "NetworkManagerUtils.h"
@@ -552,6 +553,12 @@ int main( int argc, char *argv[] )
 	gboolean		 become_daemon = TRUE;
 	gboolean		 enable_test_devices = FALSE;
 	GMainLoop		*loop  = NULL;
+	
+	if ((int)getuid() != 0)
+	{
+		printf( "You must be root to run NetworkManager!\n");
+		return (EXIT_FAILURE);
+	}
 
 	/* Parse options */
 	while (1)
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index 5a35c844e4..8a0f7054e7 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -1144,7 +1144,7 @@ void nm_device_set_mode_adhoc (NMDevice *dev)
 	g_return_if_fail (dev != NULL);
 	g_return_if_fail (nm_device_is_wireless (dev));
 
-	/* Force the card into Managed/Infrastructure mode */
+	/* Force the card into Adhoc mode */
 	sk = iw_sockets_open ();
 	if (sk >= 0)
 	{
diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c
index ed1ec7baa4..f684d6ec2f 100644
--- a/src/backends/NetworkManagerDebian.c
+++ b/src/backends/NetworkManagerDebian.c
@@ -249,15 +249,3 @@ void nm_system_load_device_modules (void)
 	return;
 }
 
-
-/*
- * nm_system_device_update_config_info
- *
- * Retrieve any relevant configuration info for a particular device
- * from the system network configuration information.  Clear out existing
- * info before setting stuff too.
- *
- */
-void nm_system_device_update_config_info (NMDevice *dev)
-{
-}