diff --git a/vtun.service b/vtun.service
new file mode 100644
index 0000000..d872e6f
--- /dev/null
+++ b/vtun.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Virtual Tunnels over TCP/IP networks
+After=local-fs.target
+
+[Service]
+ExecStart=/usr/sbin/vtund -i 
+StandardInput=socket
diff --git a/vtun.socket b/vtun.socket
new file mode 100644
index 0000000..0dd22f9
--- /dev/null
+++ b/vtun.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Vtun Activation Socket
+
+[Socket]
+ListenStream=5000
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/vtun.spec b/vtun.spec
index 0e8aa98..86d2d5d 100644
--- a/vtun.spec
+++ b/vtun.spec
@@ -1,13 +1,14 @@
 Name: vtun
 Version: 3.0.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Virtual tunnel over TCP/IP networks
 License: GPLv2+
 Group: System Environment/Daemons
 Url: http://vtun.sourceforge.net
 Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: vtund.init
-Source2: vtund.systemd
+Source2: vtun.socket
+Source3: vtun.service
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xinetd
 Requires(post): /sbin/chkconfig
@@ -16,7 +17,7 @@ Requires(preun): /sbin/service
 Requires(preun): systemd-units
 Requires(postun): /sbin/service 
 Requires(postun): systemd-units
-BuildRequires: zlib-devel lzo-devel openssl-devel bison flex
+BuildRequires: zlib-devel lzo-devel openssl-devel bison flex systemd-units
 
 %description
 VTun provides a method for creating Virtual Tunnels over TCP/IP networks
@@ -38,7 +39,8 @@ require modification to any kernel parts.
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -D -m 0755 -p %{SOURCE1} %{buildroot}/%{_initrddir}/vtund
-%{__install} -D -m 0644 -p %{SOURCE2} %{buildroot}/lib/systemd/system/vtund.service
+%{__install} -D -m 0644 -p %{SOURCE2} %{buildroot}/%{_unitdir}/vtun.socket
+%{__install} -D -m 0644 -p %{SOURCE2} %{buildroot}/%{_unitdir}/vtun.service
 %{__install} -D -m 0644 -p scripts/vtund.xinetd %{buildroot}/%{_sysconfdir}/xinetd.d/vtun
 %{__sed} -i 's:/usr/local:%{_prefix}:' %{buildroot}/%{_sysconfdir}/xinetd.d/vtun
 %{__make} install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p"
@@ -80,6 +82,9 @@ fi
 %{_mandir}/man8/vtund.8*
 
 %changelog
+* Sat Sep 10 2011 Gabriel Somlo <somlo at cmu.edu> 3.0.1-11
+- update support for systemd (#737195)
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/vtund.systemd b/vtund.systemd
deleted file mode 100644
index 47f7bc8..0000000
--- a/vtund.systemd
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=virtual tunnel daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/vtund -s
-
-[Install]
-WantedBy=multi-user.target