diff --git a/network/files/network-manager.disabled.conf b/network/files/network-manager.disabled.conf
new file mode 100644
index 0000000..1a91593
--- /dev/null
+++ b/network/files/network-manager.disabled.conf
@@ -0,0 +1,14 @@
+# network-manager - network connection manager
+#
+# The Network Manager daemon manages the system's network connections,
+# automatically switching between the best available.
+
+description	"network connection manager"
+
+start on never
+stop on stopping dbus
+
+expect fork
+respawn
+
+exec NetworkManager
diff --git a/network/manifests/init.pp b/network/manifests/init.pp
index e489746..17bd7a0 100644
--- a/network/manifests/init.pp
+++ b/network/manifests/init.pp
@@ -440,3 +440,35 @@ define network::vlan($device, $ipaddr = "none", $netmask = "none") {
 	}
     }
 }
+
+
+# Disable NetworkManager.
+#
+class network::manager::disable {
+
+    case $operatingsystem {
+        ubuntu: {
+            file { "/etc/init/network-manager.conf":
+                ensure => present,
+                mode   => 0644,
+                owner  => root,
+                group  => root,
+                source => "puppet:///modules/network/network-manager.disabled.conf",
+            }
+            xdg::autostart { "nm-applet":
+                enable => false,
+            }
+        }
+    }
+
+    service { "network-manager":
+        name      => $operatingsystem ? {
+            ubuntu  => "network-manager",
+            default => "NetworkManager",
+        },
+        ensure    => stopped,
+        enable    => false,
+        hasstatus => true,
+    }
+
+}