diff --git a/confluent_server/MANIFEST.in b/confluent_server/MANIFEST.in
index 9a596b39..849e5d43 100644
--- a/confluent_server/MANIFEST.in
+++ b/confluent_server/MANIFEST.in
@@ -1 +1,2 @@
 include sysvinit/*
+include systemd/*
diff --git a/confluent_server/setup.py.tmpl b/confluent_server/setup.py.tmpl
index f1976672..86ffe696 100644
--- a/confluent_server/setup.py.tmpl
+++ b/confluent_server/setup.py.tmpl
@@ -15,6 +15,7 @@ setup(
                       'pyghmi>=0.6.5'],
     scripts=['bin/confluent'],
     data_files=[('/etc/init.d', ['sysvinit/confluent']),
+                ('/usr/lib/systemd/system', ['systemd/confluent.service']),
 		('/opt/confluent/lib/python/confluent/plugins/console/', [])],
 
 )
diff --git a/confluent_server/systemd/confluent.service b/confluent_server/systemd/confluent.service
new file mode 100644
index 00000000..efe15527
--- /dev/null
+++ b/confluent_server/systemd/confluent.service
@@ -0,0 +1,12 @@
+# IBM(c) 2015 Apache 2.0
+[Unit]
+Description=Confluent hardware manager 
+
+[Service]
+Type=forking
+PIDFile=/var/run/confluent/pid
+ExecStart=/opt/confluent/bin/confluent
+
+[Install]
+WantedBy=multi-user.target
+