diff --git a/manifests/os/ubuntu.pp b/manifests/os/ubuntu.pp
index 108f774a65c4fb0afcc2419db79f6e941b6a7cf7..79760b870b2f89e9e0ff67ebdbf0f392dcf07360 100644
--- a/manifests/os/ubuntu.pp
+++ b/manifests/os/ubuntu.pp
@@ -8,14 +8,20 @@ class base::os::ubuntu inherits base::os::debian {
       source => 'puppet:///modules/base/os/etc/apt/apt.conf.d/06apt';
     '/etc/bash.bashrc':
       source => 'puppet:///modules/base/os/etc/bash.bashrc';
-    '/etc/init/supervise.conf':
-      source => 'puppet:///modules/base/os/etc/init/supervise.conf',
-      notify => Exec['start supervise'];
   }
 
-  # Triggered on Ubuntu to start the supervise process.
-  exec { 'start supervise':
-    command     => '/sbin/start supervise',
-    refreshonly => true,
+  # Triggered on Ubuntu to start the supervise process.  Only on 14.10 and below.
+  if ($::lsbmajdistrelease < 15) {
+    include base::daemontools
+    file {
+      '/etc/init/supervise.conf':
+        source => 'puppet:///modules/base/os/etc/init/supervise.conf',
+        notify => Exec['start supervise'],
+    }
+    exec { 'start supervise':
+      command     => '/sbin/start supervise',
+      refreshonly => true,
+      require     => Package['daemontools'],
+    }
   }
 }