diff --git a/srcpkgs/xinetd/files/servers b/srcpkgs/xinetd/files/servers
new file mode 100644
index 0000000000..f064c8d7a7
--- /dev/null
+++ b/srcpkgs/xinetd/files/servers
@@ -0,0 +1,10 @@
+service servers
+{
+        type            = INTERNAL UNLISTED
+        port            = 9099
+        socket_type     = stream
+        protocol        = tcp
+        wait            = no
+        disable         = yes
+        only_from       = 127.0.0.1
+}
diff --git a/srcpkgs/xinetd/files/services b/srcpkgs/xinetd/files/services
new file mode 100644
index 0000000000..4ea304c4f1
--- /dev/null
+++ b/srcpkgs/xinetd/files/services
@@ -0,0 +1,10 @@
+service services
+{
+        type            = INTERNAL UNLISTED
+        port            = 9098
+        socket_type     = stream
+        protocol        = tcp
+        wait            = no
+        disable         = yes
+        only_from       = 127.0.0.1
+}
diff --git a/srcpkgs/xinetd/files/xinetd.conf b/srcpkgs/xinetd/files/xinetd.conf
new file mode 100644
index 0000000000..b15d9f6494
--- /dev/null
+++ b/srcpkgs/xinetd/files/xinetd.conf
@@ -0,0 +1,14 @@
+#
+# /etc/xinetd.conf
+#
+
+defaults
+{
+        instances               = 60
+        log_type                = SYSLOG authpriv
+        log_on_success          = HOST PID
+        log_on_failure          = HOST
+        cps                     = 25 30
+}
+
+includedir /etc/xinetd.d
diff --git a/srcpkgs/xinetd/patches/fix-CVE-2013-4342.patch b/srcpkgs/xinetd/patches/fix-CVE-2013-4342.patch
new file mode 100644
index 0000000000..46fce7bb7b
--- /dev/null
+++ b/srcpkgs/xinetd/patches/fix-CVE-2013-4342.patch
@@ -0,0 +1,11 @@
+--- xinetd/builtins.c
++++ xinetd/builtins.c
+@@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp )
+    if( SC_IS_INTERNAL( scp ) ) {
+       SC_INTERNAL(scp, nserp);
+    } else {
+-      exec_server(nserp);
++      child_process(nserp);
+    }
+ }
+ 
diff --git a/srcpkgs/xinetd/template b/srcpkgs/xinetd/template
new file mode 100644
index 0000000000..9267b3e060
--- /dev/null
+++ b/srcpkgs/xinetd/template
@@ -0,0 +1,23 @@
+# Template file for 'xinetd'
+pkgname=xinetd
+version=2.3.15
+revision=1
+build_style=gnu-configure
+configure_args="--without-libwrap"
+short_desc="A secure replacement for inetd"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="BSD"
+homepage="http://www.xinetd.org/"
+distfiles="http://pkgs.fedoraproject.org/repo/pkgs/xinetd/xinetd-${version}.tar.gz/77358478fd58efa6366accae99b8b04c/xinetd-${version}.tar.gz"
+checksum=bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3
+
+conf_files="/etc/xinetd.conf /etc/xinetd.d/servers /etc/xinetd.d/services"
+
+do_install() {
+	make prefix=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man install
+
+	vinstall ${FILESDIR}/xinetd.conf 644 etc
+	vinstall ${FILESDIR}/servers 644 etc/xinetd.d
+	vinstall ${FILESDIR}/services 644 etc/xinetd.d
+	vinstall COPYRIGHT 644 usr/share/licenses/$pkgname
+}