diff --git a/ChangeLog b/ChangeLog
index 9bc1c3dd99..70429dfc62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2004-09-07  Dan Williams <dcbw@redhat.com>
+
+	Patches below from:
+		<j@bootlab.org>
+		Mark Roach <mrroach@okmaybe.com>
+		Thom May <thom@debian.org>
+
+	* configure.in
+	  initscript/Debian/NetworkManager
+	  initscript/Debian/Makefile.am
+		- Initscript for Debian
+
+	* src/backends/NetworkManagerDebian.c
+		- Add missing system init function to allow compilation
+			on Debian
+
 2004-09-03  Raphael Higino <raphaelh@cvs.gnome.org>
 
 	* configure.in: Added 'pt_BR' to ALL_LINGUAS.
diff --git a/configure.in b/configure.in
index d189cf5aaa..b8be1de041 100644
--- a/configure.in
+++ b/configure.in
@@ -139,6 +139,7 @@ test/Makefile
 initscript/Makefile
 initscript/RedHat/Makefile
 initscript/Gentoo/Makefile
+initscript/Debian/Makefile
 po/Makefile.in
 NetworkManager.pc
 ])
diff --git a/initscript/Debian/Makefile.am b/initscript/Debian/Makefile.am
new file mode 100644
index 0000000000..85954b839d
--- /dev/null
+++ b/initscript/Debian/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = NetworkManager 
+
+initddir = $(sysconfdir)/init.d
+initd_SCRIPTS = NetworkManager
diff --git a/initscript/Debian/NetworkManager b/initscript/Debian/NetworkManager
new file mode 100755
index 0000000000..483858e08d
--- /dev/null
+++ b/initscript/Debian/NetworkManager
@@ -0,0 +1,73 @@
+#! /bin/sh
+#
+# NetworkManager	NetworkManager daemon
+#				Daemon for automatically switching network 
+#				connections to the best available connection.
+#				This file should be placed in /etc/init.d.
+#
+# Authors:	<j@bootlab.org>
+#			Mark Roach <mrroach@okmaybe.com>
+#			Thom May <thom@debian.org>
+#
+# Version:	@(#)skeleton  2.85-23  28-Jul-2004  miquels@cistron.nl
+#
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DESC="Network connection manager daemon"
+NAME="NetworkManager"
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=root
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+# We need /sbin/ip
+[ -x /sbin/ip ] || exit 1
+
+#
+#	Function that starts the daemon/service.
+#
+d_start() {
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+		--user $USER --exec $DAEMON -- $DAEMON_OPTS
+	NMLaunchHelper
+}
+
+#
+#	Function that stops the daemon/service.
+#
+d_stop() {
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+		 --oknodo --user $USER --exec $DAEMON
+}
+
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: $NAME"
+	d_start
+	echo "."
+	;;
+  stop)
+	echo -n "Stopping $DESC: $NAME"
+	d_stop
+	echo "."
+	;;
+  restart|force-reload)
+	echo -n "Restarting $DESC: $NAME"
+	d_stop
+	sleep 1
+	d_start
+	echo "."
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c
index c7489096dd..fbc5d5f4b7 100644
--- a/src/backends/NetworkManagerDebian.c
+++ b/src/backends/NetworkManagerDebian.c
@@ -30,6 +30,17 @@
 #include "NetworkManagerDevice.h"
 
 
+/*
+ * nm_system_init
+ *
+ * Initializes the distribution-specific system backend
+ *
+ */
+void nm_system_init (void)
+{
+}
+
+
 /*
  * nm_system_device_run_dhcp
  *