diff --git a/debian/cinder-backup.init b/debian/cinder-backup.init
index 0376386d3..d7f2b6cb9 100644
--- a/debian/cinder-backup.init
+++ b/debian/cinder-backup.init
@@ -19,7 +19,7 @@ DESC="OpenStack Cinder Backup"
 NAME=cinder-backup
 DAEMON=/usr/bin/cinder-backup
 DAEMON_ARGS="--config-file=/etc/cinder/cinder.conf"
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/var/run/cinder/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 CINDER_USER=cinder
 LOCK_DIR=/var/lock/cinder/
@@ -27,8 +27,8 @@ LOCK_DIR=/var/lock/cinder/
 # Exit if the package is not installed
 [ -x $DAEMON ] || exit 0
 
-mkdir -p ${LOCK_DIR}
-chown ${CINDER_USER} ${LOCK_DIR}
+mkdir -p ${LOCK_DIR} /var/run/cinder
+chown ${CINDER_USER} ${LOCK_DIR} /var/run/cinder
 
 . /lib/lsb/init-functions
 
@@ -73,6 +73,12 @@ stop)
 status)
 	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
 ;;
+systemd-start)
+    do_start
+;;
+systemd-stop)
+    do_stop
+;;
 restart|force-reload)
 	log_daemon_msg "Restarting $DESC" "$NAME"
 	do_stop
diff --git a/debian/cinder-backup.service b/debian/cinder-backup.service
new file mode 100644
index 000000000..6ba554f12
--- /dev/null
+++ b/debian/cinder-backup.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=OpenStack Cinder Backup
+Documentation=http://docs.openstack.org/
+After=postgresql.service mysql.service keystone.service rabbitmq-server.service ntp.service network.service
+
+[Service]
+User=cinder
+Group=cinder
+ExecStart=/etc/init.d/cinder-backup systemd-start
+ExecStop=/etc/init.d/cinder-backup systemd-stop
+PIDFile=/var/run/cinder/cinder-backup.pid
+Restart=on-failure
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
+