diff -Nru quassel-0.12~beta1/debian/changelog quassel-0.12~beta1/debian/changelog
--- quassel-0.12~beta1/debian/changelog	2015-02-19 07:58:52.000000000 -0500
+++ quassel-0.12~beta1/debian/changelog	2015-03-16 18:08:48.000000000 -0400
@@ -1,3 +1,11 @@
+quassel (0.12~beta1-0ubuntu2) vivid; urgency=medium
+
+  * Add back DAEMON_OPTS support for systemd and upstart
+  * Add Wants and After on postgresql for systemd
+  * Add Restart=on-failure for systemd
+
+ -- Michael Marley <michael@michaelmarley.com>  Mon, 16 Mar 2015 18:08:13 -0400
+
 quassel (0.12~beta1-0ubuntu1) vivid; urgency=medium
 
   [ Michael Marley ]
diff -Nru quassel-0.12~beta1/debian/quassel-core.quasselcore.default quassel-0.12~beta1/debian/quassel-core.quasselcore.default
--- quassel-0.12~beta1/debian/quassel-core.quasselcore.default	2015-02-19 07:41:19.000000000 -0500
+++ quassel-0.12~beta1/debian/quassel-core.quasselcore.default	2015-03-16 15:36:07.000000000 -0400
@@ -6,3 +6,6 @@
 
 # The port quasselcore will listen at. Default is: 4242
 PORT="4242"
+
+# Extra arguments to pass to quasselcore.
+DAEMON_OPTS=""
diff -Nru quassel-0.12~beta1/debian/quassel-core.quasselcore.systemd quassel-0.12~beta1/debian/quassel-core.quasselcore.systemd
--- quassel-0.12~beta1/debian/quassel-core.quasselcore.systemd	2015-02-19 07:41:19.000000000 -0500
+++ quassel-0.12~beta1/debian/quassel-core.quasselcore.systemd	2015-03-16 15:27:51.000000000 -0400
@@ -1,15 +1,16 @@
 [Unit]
 Description=distributed IRC client using a central core component
-Wants=network-online.target
-After=network-online.target
+Wants=network-online.target postgresql.service
+After=network-online.target postgresql.service
 
 [Service]
 User=quasselcore
 Group=quassel
 WorkingDirectory=/var/lib/quassel
-Environment="DATADIR=/var/lib/quassel" "LOGFILE=/var/log/quassel/core.log" "LOGLEVEL=Info" "PORT=4242"
+Environment="DATADIR=/var/lib/quassel" "LOGFILE=/var/log/quassel/core.log" "LOGLEVEL=Info" "PORT=4242" "DAEMON_OPTS="
 EnvironmentFile=-/etc/default/quasselcore
-ExecStart=/usr/bin/quasselcore --configdir=${DATADIR} --logfile=${LOGFILE} --loglevel=${LOGLEVEL} --port=${PORT}
+ExecStart=/usr/bin/quasselcore --configdir=${DATADIR} --logfile=${LOGFILE} --loglevel=${LOGLEVEL} --port=${PORT} $DAEMON_OPTS
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff -Nru quassel-0.12~beta1/debian/quassel-core.quasselcore.upstart quassel-0.12~beta1/debian/quassel-core.quasselcore.upstart
--- quassel-0.12~beta1/debian/quassel-core.quasselcore.upstart	2015-02-19 07:41:36.000000000 -0500
+++ quassel-0.12~beta1/debian/quassel-core.quasselcore.upstart	2015-03-16 15:31:54.000000000 -0400
@@ -26,9 +26,10 @@
 	LOGFILE="/var/log/quassel/core.log"
 	LOGLEVEL="Info"
 	PORT="4242"
+	DAEMON_OPTS=""
 
 	test -f /etc/default/quasselcore && . /etc/default/quasselcore
 
-	exec quasselcore --configdir=$DATADIR --logfile=$LOGFILE --loglevel=$LOGLEVEL --port=$PORT
+	exec quasselcore --configdir=$DATADIR --logfile=$LOGFILE --loglevel=$LOGLEVEL --port=$PORT $DAEMON_OPTS
 end script
 post-stop exec sleep 5