diff --git a/telnet-xinetd b/telnet-xinetd
deleted file mode 100644
index 959848b..0000000
--- a/telnet-xinetd
+++ /dev/null
@@ -1,14 +0,0 @@
-# default: on
-# description: The telnet server serves telnet sessions; it uses \
-#	unencrypted username/password pairs for authentication.
-service telnet
-{
-	flags		= REUSE
-	socket_type	= stream        
-	wait		= no
-	user		= root
-	server		= /usr/sbin/in.telnetd
-	log_on_failure	+= USERID
-	disable		= yes
-}
-
diff --git a/telnet.socket b/telnet.socket
new file mode 100644
index 0000000..811b672
--- /dev/null
+++ b/telnet.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=Telnet Server Activation Socket
+Documentation=man:telnetd(8)
+
+[Socket]
+ListenStream=23
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/telnet.spec b/telnet.spec
index 8f87aae..44074a2 100644
--- a/telnet.spec
+++ b/telnet.spec
@@ -1,7 +1,7 @@
 Summary: The client program for the Telnet remote login protocol
 Name: telnet
 Version: 0.17
-Release: 55%{?dist}
+Release: 56%{?dist}
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -9,8 +9,9 @@ Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-%{vers
 Url: http://web.archive.org/web/20070819111735/www.hcs.harvard.edu/~dholland/computers/old-netkit.html
 # telnet-client tarball is snapshot of the OpenBSD client telnet
 Source2: telnet-client.tar.gz
-Source3: telnet-xinetd
 Source4: telnet.wmconfig
+Source5: telnet@.service
+Source6: telnet.socket
 Patch1: telnet-client-cvs.patch
 Patch5: telnetd-0.17.diff
 Patch6: telnet-0.17-env.patch
@@ -34,14 +35,16 @@ Patch25: telnet-rh704604.patch
 Patch26: telnet-rh825946.patch
 
 BuildRequires: ncurses-devel
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Telnet is a popular protocol for logging into remote systems over the
 Internet. The package provides a command line Telnet client
 
 %package server
-Requires: xinetd
+Requires: systemd
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 Group: System Environment/Daemons
 Summary: The server program for the Telnet remote login protocol
 
@@ -108,20 +111,26 @@ perl -pi -e 's|install[ ]+-s|install|g' \
 make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
+mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man5
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 
 make INSTALLROOT=${RPM_BUILD_ROOT} install
 
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d
-install -p -m644 %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/telnet
+install -p -m644 %SOURCE5 ${RPM_BUILD_ROOT}%{_unitdir}/telnet@.service
+install -p -m644 %SOURCE6 ${RPM_BUILD_ROOT}%{_unitdir}/telnet.socket
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+%post server
+%systemd_post telnet.socket
+
+%preun server
+%systemd_preun telnet.socket
+
+%postun server
+%systemd_postun_with_restart telnet.socket
 
 %files
 %doc README
@@ -131,13 +140,16 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files server
 %defattr(-,root,root,-)
-%config(noreplace) /etc/xinetd.d/telnet
+%{_unitdir}/*
 %{_sbindir}/in.telnetd
 %{_mandir}/man5/issue.net.5*
 %{_mandir}/man8/in.telnetd.8*
 %{_mandir}/man8/telnetd.8*
 
 %changelog
+* Mon May 06 2013 Michal Sekletar <msekleta@redhat.com> - 1:0.17-56
+- telnet-server will use systemd socket based activation instead of xinetd
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.17-55
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/telnet@.service b/telnet@.service
new file mode 100644
index 0000000..7bf5914
--- /dev/null
+++ b/telnet@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Telnet Server
+After=local-fs.target
+
+[Service]
+ExecStart=-/usr/sbin/in.telnetd
+StandardInput=socket