diff --git a/ChangeLog b/ChangeLog
index 811f4c9f31..ab32433a71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-16  Allan McRae  <allan@archlinux.org>
+
+	* nscd/nscd.service: New file.
+	* nscd/nscd.tmpfiles: New file.
+
 2013-12-14  Ondřej Bílka  <neleai@seznam.cz>
 
 	[BZ #12100]
diff --git a/nscd/nscd.service b/nscd/nscd.service
new file mode 100644
index 0000000000..99c7563990
--- /dev/null
+++ b/nscd/nscd.service
@@ -0,0 +1,18 @@
+# systemd service file for nscd
+
+[Unit]
+Description=Name Service Cache Daemon
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/nscd --foreground
+ExecStop=/usr/sbin/nscd --shutdown
+ExecReload=/usr/sbin/nscd -i passwd
+ExecReload=/usr/sbin/nscd -i group
+ExecReload=/usr/sbin/nscd -i hosts
+ExecReload=/usr/sbin/nscd -i services
+Restart=always
+PIDFile=/run/nscd/nscd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/nscd/nscd.tmpfiles b/nscd/nscd.tmpfiles
new file mode 100644
index 0000000000..52edbba673
--- /dev/null
+++ b/nscd/nscd.tmpfiles
@@ -0,0 +1,4 @@
+# Configuration to create /run/nscd directory
+# Used as part of systemd's tmpfiles
+
+d /run/nscd 0755 root root