diff --git a/README.md b/README.md
index 4231887e..b70b13f4 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@ Built-in optional inetd services:
 
 - echo RFC862
 - chargen RFC864
+- daytime RFC867
 - discard RFC863
 - time (rdate) RFC868
 
@@ -487,6 +488,7 @@ network testing/availability, as well as a rudimentary time server for
 
 - echo
 - chargen
+- daytime
 - discard
 - time
 
@@ -499,6 +501,8 @@ the `finit.conf` or `finit.d/*.conf` like this:
     inetd echo/tcp         nowait [2345] internal
     inetd chargen/udp        wait [2345] internal
     inetd chargen/tcp      nowait [2345] internal
+    inetd daytime/udp        wait [2345] internal
+    inetd daytime/tcp      nowait [2345] internal
     inetd discard/udp        wait [2345] internal
     inetd discard/tcp      nowait [2345] internal
     inetd time/udp           wait [2345] internal
@@ -577,6 +581,8 @@ For your convenience a set of *optional* plugins are available:
 
 * *chargen.so*: RFC 864 plugin.  Start as inetd service, like time below.
 
+* *daytime.so*: RFC 867 plugin.  Start as inetd service, like time below.
+
 * *discard.so*: RFC 863 plugin.  Start as inetd service, like time below.
 
 * *hwclock.so*: Restore and save system clock from/to RTC on
diff --git a/configure.ac b/configure.ac
index 2e1f4081..772af2f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,8 @@ AC_PLUGIN([alsa-utils],    [no],  [Save and restore ALSA sound settings using al
 AC_PLUGIN([dbus],          [no],  [Setup and start system message bus, D-Bus])
 AC_PLUGIN([inetd-echo],    [no],  [Inetd plugin: echo server, RFC862])
 AC_PLUGIN([inetd-chargen], [no],  [Inetd plugin: character generator, RFC864])
-AC_PLUGIN([inetd-discard], [no],  [Inetd plugin: discard server, RFC862])
+AC_PLUGIN([inetd-daytime], [no],  [Inetd plugin: daytime server, RFC867])
+AC_PLUGIN([inetd-discard], [no],  [Inetd plugin: discard server, RFC863])
 AC_PLUGIN([inetd-time],    [no],  [Inetd plugin: time (rdate) server, RFC868])
 AC_PLUGIN([lost],          [no],  [Example HOOK_SVC_LOST plugin, very noisy as-is!])
 AC_PLUGIN([resolvconf],    [no],  [Setup necessary files for resolvconf])
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 49d6a5c4..80533802 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -23,6 +23,10 @@ if BUILD_INETD_CHARGEN_PLUGIN
 libplug_la_SOURCES += chargen.c
 endif
 
+if BUILD_INETD_DAYTIME_PLUGIN
+libplug_la_SOURCES += daytime.c
+endif
+
 if BUILD_INETD_DISCARD_PLUGIN
 libplug_la_SOURCES += discard.c
 endif
@@ -62,6 +66,10 @@ if BUILD_INETD_CHARGEN_PLUGIN
 pkglib_LTLIBRARIES += chargen.la
 endif
 
+if BUILD_INETD_DAYTIME_PLUGIN
+pkglib_LTLIBRARIES += daytime.la
+endif
+
 if BUILD_INETD_DISCARD_PLUGIN
 pkglib_LTLIBRARIES += discard.la
 endif
diff --git a/plugins/daytime.c b/plugins/daytime.c
new file mode 100644
index 00000000..64264176
--- /dev/null
+++ b/plugins/daytime.c
@@ -0,0 +1,96 @@
+/* Optional inetd plugin for Daytime Protocol, RFC 867
+ *
+ * Copyright (c) 2016  Joachim Nilsson <troglobit@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <arpa/inet.h>
+#include <time.h>
+#include <unistd.h>		/* STDIN_FILENO */
+#include <sys/socket.h>
+
+#include "../plugin.h"
+
+static char *daytime(char *buf, size_t len)
+{
+	time_t t;
+	struct tm *tmp;
+
+	t = time(NULL);
+	tmp = localtime(&t);
+
+	memset(buf, 0, len);
+	strftime(buf, len, "%a, %B %d, %Y %T-%Z", tmp);
+
+	return buf;
+}
+
+static int recv_peer(int sd, char *buf, ssize_t len, struct sockaddr *sa, socklen_t *sa_len)
+{
+	len = recvfrom(sd, buf, sizeof(buf), MSG_DONTWAIT, sa, sa_len);
+	if (-1 == len)
+		return -1;	/* On error, close connection. */
+
+	return 0;
+} 
+
+static int send_peer(int sd, char *buf, ssize_t len, struct sockaddr *sa, socklen_t sa_len)
+{
+	char *now = daytime(buf, len);
+
+	return sendto(sd, now, strlen(now), MSG_DONTWAIT, sa, sa_len);
+}
+
+static int cb(int type)
+{
+	int sd = STDIN_FILENO;
+	char buf[BUFSIZ];
+	struct sockaddr_storage sa;
+	socklen_t sa_len = sizeof(sa);
+
+	if (recv_peer(sd, buf, sizeof(buf), (struct sockaddr *)&sa, &sa_len))
+		return -1;
+
+	return send_peer(sd, buf, sizeof(buf), (struct sockaddr *)&sa, sa_len);
+}
+
+static plugin_t plugin = {
+	.name  = "daytime",	/* Must match the inetd /etc/services entry */
+	.inetd = {
+		.cmd = cb
+	}
+};
+
+PLUGIN_INIT(plugin_init)
+{
+	plugin_register(&plugin);
+}
+
+PLUGIN_EXIT(plugin_exit)
+{
+	plugin_unregister(&plugin);
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */