diff --git a/debian/init.d b/debian/diamond.init
similarity index 100%
rename from debian/init.d
rename to debian/diamond.init
diff --git a/debian/upstart/diamond.conf b/debian/diamond.upstart
similarity index 100%
rename from debian/upstart/diamond.conf
rename to debian/diamond.upstart
diff --git a/debian/postinst b/debian/postinst
index 99247f043..81b2767fb 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -49,9 +49,4 @@ chmod +x /usr/bin/diamond
 # Log / Run directory permissions
 chown -R diamond /var/log/diamond
 
-if [ -x /lib/init/upstart-job ]
-then
-    ln -f -s /lib/init/upstart-job /etc/init.d/diamond
-fi
-
 exit 0
diff --git a/setup.py b/setup.py
index bde24ae9e..e9dfc763c 100755
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,7 @@ def running_under_virtualenv():
 
         if distro == 'Ubuntu':
             data_files.append(('/etc/init',
-                               ['debian/upstart/diamond.conf']))
+                               ['debian/diamond.upstart']))
         if distro in ['centos', 'redhat', 'debian', 'fedora']:
             data_files.append(('/etc/init.d',
                                ['bin/init.d/diamond']))