diff --git a/CHANGES b/CHANGES
index cbbb6b4..33db311 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,4 +8,5 @@
    is nowhere near being a complete package
 
 0.9.2 UNRELEASED
- - Improved pakcage requirements definition
+ - Improved package requirements definition
+ - Added systemd unit file
diff --git a/MANIFEST.in b/MANIFEST.in
index 991cc67..bd5e86b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
 include etc/*
 include man/*
+include system/*
 include Authors.conf
 include TODO
 include README
diff --git a/setup.py b/setup.py
index c296d42..11571a4 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,8 @@ setup(
     },
     include_package_data=True,
     data_files=[(os.path.join('share', 'man', 'man5'),
-        ['man/dkimpy-milter.conf.5']), ('etc', ['etc/dkimpy-milter.conf'])],
+        ['man/dkimpy-milter.conf.5']), ('etc', ['etc/dkimpy-milter.conf']),
+        (os.path.join('/lib', 'systemd', 'system'), ['system/dkimpy-milter.service'])],
 
     install_requires = ['dkimpy>=0.7', 'pymilter', 'authres>=1.0.2', 'nacl'],
     zip_safe = False,
diff --git a/system/dkimpy-milter.service b/system/dkimpy-milter.service
new file mode 100644
index 0000000..612774d
--- /dev/null
+++ b/system/dkimpy-milter.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=DKIMpy Milter
+After=syslog.target network.target
+
+[Service]
+Type=simple
+PIDFile=/var/run/dkimpy-milter/dkimpy-milter.pid
+ExecStart=/usr/local/bin/dkimpy-milter 
+
+[Install]
+WantedBy=multi-user.target