diff --git a/Makefile b/Makefile
index a8fe1a6a1..c14a65db9 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,7 @@ test:
 
 install:
 	cp deb/drone/etc/init/drone.conf /etc/init/drone.conf
+	test -f /etc/default/drone || cp deb/drone/etc/default/drone /etc/default/drone
 	cd bin && install -t /usr/local/bin drone
 	cd bin && install -t /usr/local/bin droned
 	mkdir -p /var/lib/drone
@@ -75,4 +76,4 @@ dpkg:
 	dpkg-deb --build deb/drone
 
 run:
-	bin/droned --port=":8080" --datasource="/tmp/drone.sqlite"
\ No newline at end of file
+	bin/droned --port=":8080" --datasource="/tmp/drone.sqlite"
diff --git a/deb/drone/DEBIAN/conffiles b/deb/drone/DEBIAN/conffiles
new file mode 100644
index 000000000..fb1baab83
--- /dev/null
+++ b/deb/drone/DEBIAN/conffiles
@@ -0,0 +1,2 @@
+/etc/init/drone.conf
+/etc/default/drone
diff --git a/deb/drone/etc/default/drone b/deb/drone/etc/default/drone
new file mode 100644
index 000000000..1eaa2679b
--- /dev/null
+++ b/deb/drone/etc/default/drone
@@ -0,0 +1,10 @@
+# Upstart configuration file for droned.
+
+# Command line options:
+#
+#   -datasource="drone.sqlite":
+#   -driver="sqlite3":
+#   -path="":
+#   -port=":8080":
+#         
+#DRONED_OPTS="--port=:80"
diff --git a/deb/drone/etc/init/drone.conf b/deb/drone/etc/init/drone.conf
index 102b2bc34..6cae6ac34 100644
--- a/deb/drone/etc/init/drone.conf
+++ b/deb/drone/etc/init/drone.conf
@@ -4,5 +4,9 @@ chdir /var/lib/drone
 console log
 
 script
-    droned --port=":80"
-end script
\ No newline at end of file
+    DRONED_OPTS="--port=:80"
+    if [ -f /etc/default/$UPSTART_JOB ]; then
+        . /etc/default/$UPSTART_JOB
+    fi
+    droned $DRONED_OPTS
+end script