diff --git a/.travis/install_salt b/.travis/install_salt
index 8d59a8d0..b9256021 100755
--- a/.travis/install_salt
+++ b/.travis/install_salt
@@ -8,6 +8,8 @@ install_salt () {
     if [ "${OS_NAME}" = "linux" ]; then
         printf "$0: installing salt for Linux\n"
         # Use Trusty (Ubuntu 14.04) on Travis
+        # Don't autostart services
+        printf '#!/bin/sh\nexit 101\n' | sudo install -m 755 /dev/stdin /usr/sbin/policy-rc.d
         curl https://repo.saltstack.com/apt/ubuntu/14.04/amd64/archive/2015.5.8/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
         printf 'deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/archive/2015.5.8 trusty main\n' | sudo tee -a /etc/apt/sources.list >/dev/null
         sudo apt-get -y update
diff --git a/top.sls b/top.sls
index 92356491..7d4f2660 100644
--- a/top.sls
+++ b/top.sls
@@ -5,6 +5,10 @@ base:
     - common
     - servo-dependencies
 
+  'os:Ubuntu':
+    - match: grain
+    - ubuntu
+
   'servo-head':
     - buildbot.slave
     - android-dependencies
diff --git a/ubuntu/files/policy-rc.d b/ubuntu/files/policy-rc.d
new file mode 100644
index 00000000..0b1556d7
--- /dev/null
+++ b/ubuntu/files/policy-rc.d
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 101
diff --git a/ubuntu/init.sls b/ubuntu/init.sls
new file mode 100644
index 00000000..2c256ea7
--- /dev/null
+++ b/ubuntu/init.sls
@@ -0,0 +1,8 @@
+# Disable service autostart on package install
+# Use Salt to manage service [re-]start on package change
+/usr/sbin/policy-rc.d:
+  file.managed:
+    - user: root
+    - group: root
+    - mode: 755
+    - source: salt://{{ tpldir }}/files/policy-rc.d