diff -Nru keystone-2015.1~b1/debian/changelog keystone-2015.1~b1/debian/changelog
--- keystone-2015.1~b1/debian/changelog	2015-01-05 14:27:00.000000000 +0000
+++ keystone-2015.1~b1/debian/changelog	2015-01-08 12:15:21.000000000 +0000
@@ -1,3 +1,16 @@
+keystone (1:2015.1~b1-0ubuntu2) vivid; urgency=medium
+
+  * Systemd enablement:
+    - d/control: Add BD's on openstack-pkg-tools, dh-systemd.
+    - d/rules: Enable use of dh-systemd and templated init configuration
+      generation.
+    - d/keystone.init.in: Cherry pick template configuration from
+      Debian package (thanks Thomas).
+    - d/keystone.upstart: Drop in preference to generated file.
+  * d/control,compat: Bump debhelper compat level to 9. 
+
+ -- James Page <james.page@ubuntu.com>  Thu, 08 Jan 2015 12:14:53 +0000
+
 keystone (1:2015.1~b1-0ubuntu1) vivid; urgency=medium
 
   [ Chuck Short ]
diff -Nru keystone-2015.1~b1/debian/compat keystone-2015.1~b1/debian/compat
--- keystone-2015.1~b1/debian/compat	2015-01-05 14:27:00.000000000 +0000
+++ keystone-2015.1~b1/debian/compat	2015-01-08 12:15:21.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru keystone-2015.1~b1/debian/control keystone-2015.1~b1/debian/control
--- keystone-2015.1~b1/debian/control	2015-01-05 14:27:00.000000000 +0000
+++ keystone-2015.1~b1/debian/control	2015-01-08 12:15:21.000000000 +0000
@@ -5,7 +5,9 @@
 XSBC-Original-Maintainer: Monty Taylor <mordred@inaugust.com>
 Uploaders: Soren Hansen <soren@ubuntu.com>
 Build-Depends:
- debhelper (>= 7.0.50),
+ debhelper (>= 9~),
+ dh-systemd,
+ openstack-pkg-tools (>= 21~),
  pep8,
  po-debconf,
  python-all (>= 2.6),
diff -Nru keystone-2015.1~b1/debian/keystone.init.in keystone-2015.1~b1/debian/keystone.init.in
--- keystone-2015.1~b1/debian/keystone.init.in	1970-01-01 00:00:00.000000000 +0000
+++ keystone-2015.1~b1/debian/keystone.init.in	2015-01-08 12:15:21.000000000 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          keystone
+# Required-Start:    $network $local_fs $remote_fs
+# Required-Stop:     $remote_fs
+# Should-Start:      mysql postgresql slapd rabbitmq-server ntp
+# Should-Stop:       mysql postgresql slapd rabbitmq-server ntp
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: OpenStack cloud identity service
+# Description:       This is the identity service used by OpenStack for
+#                    authentication (authN) and high-level authorization (authZ).
+### END INIT INFO
+
+DESC="OpenStack Identity service"
+PROJECT_NAME=keystone
+NAME=keystone
+DAEMON=/usr/bin/keystone-all
+
diff -Nru keystone-2015.1~b1/debian/keystone.upstart keystone-2015.1~b1/debian/keystone.upstart
--- keystone-2015.1~b1/debian/keystone.upstart	2015-01-05 14:27:00.000000000 +0000
+++ keystone-2015.1~b1/debian/keystone.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-description "Keystone API server"
-author "Soren Hansen <soren@linux2go.dk>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-respawn
-
-exec start-stop-daemon --start --chuid keystone \
-            --chdir /var/lib/keystone --name keystone \
-            --exec /usr/bin/keystone-all
diff -Nru keystone-2015.1~b1/debian/rules keystone-2015.1~b1/debian/rules
--- keystone-2015.1~b1/debian/rules	2015-01-05 14:27:00.000000000 +0000
+++ keystone-2015.1~b1/debian/rules	2015-01-08 12:15:21.000000000 +0000
@@ -3,12 +3,14 @@
 # Verbose mode
 #export DH_VERBOSE=1
 
+include /usr/share/openstack-pkg-tools/pkgos.make
+
 # auth_token middleware now requires access to HOME, otherwise
 # test suite cause FTBFS.  See (LP: #1031022)
 export HOME="$(CURDIR)/debian/tests/"
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,systemd
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
@@ -50,6 +52,7 @@
 	# should be fixed upstream or updated here post-essex 
 	rm -rf $(CURDIR)/doc/source/keystone*.rst
 	rm -rf $(CURDIR)/doc/source/modules.rst
+	rm -f debian/*.init debian/*.service debian/*.upstart
 	dh_clean
 
 get-orig-source: