diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 1b3feab..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-vtun-3.0.1.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f9c375d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+vtun-3.0.1.tar.gz
+/vtun-3.0.1.tar.gz
+/vtun-3.0.3.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 68b6d3f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: vtun
-# $Id$
-NAME := vtun
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/import.log b/import.log
deleted file mode 100644
index 25326c0..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-vtun-3_0_1-3_fc8:HEAD:vtun-3.0.1-3.fc8.src.rpm:1227105889
diff --git a/vtun-client-sighup.patch b/vtun-client-sighup.patch
new file mode 100644
index 0000000..744aeae
--- /dev/null
+++ b/vtun-client-sighup.patch
@@ -0,0 +1,33 @@
+When sending a SIGHUP to a vtun client process which is unable to connect
+to the remote server, it will attempt to reconnect without sleeping between
+consecutive attempts. This results in a CPU usage spike, and a flood of
+data sent to syslog.
+This patch causes the first sleep after SIGHUP to be discarded, then allows
+sleep to be used again in subsequent iterations.
+diff -NarU5 a/client.c b/client.c
+--- a/client.c	2006-12-11 02:55:06.000000000 -0500
++++ b/client.c	2016-03-21 14:41:09.014377581 -0400
+@@ -129,10 +129,11 @@
+         vtun_syslog(LOG_INFO,"Connecting to %s", vtun.svr_name);
+ 
+         if( connect_t(s,(struct sockaddr *) &svr_addr, host->timeout) ){
+ 	   vtun_syslog(LOG_INFO,"Connect to %s failed. %s(%d)", vtun.svr_name,
+ 					strerror(errno), errno);
++	   client_term = 0;
+         } else {
+ 	   if( auth_client(s, host) ){   
+ 	      vtun_syslog(LOG_INFO,"Session %s[%s] opened",host->host,vtun.svr_name);
+ 
+  	      host->rmt_fd = s;
+@@ -141,10 +142,11 @@
+ 	      client_term = tunnel(host);
+ 
+ 	      vtun_syslog(LOG_INFO,"Session %s[%s] closed",host->host,vtun.svr_name);
+ 	   } else {
+ 	      vtun_syslog(LOG_INFO,"Connection denied by %s",vtun.svr_name);
++	      client_term = 0;
+ 	   }
+ 	}
+ 	close(s);
+ 	free_sopt(&host->sopt);
+      }
diff --git a/vtun.spec b/vtun.spec
index 98fdae6..7cd6b86 100644
--- a/vtun.spec
+++ b/vtun.spec
@@ -1,12 +1,13 @@
 Name: vtun
 Version: 3.0.1
-Release: 7%{?dist}
+Release: 10%{?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
+Patch0: vtun-client-sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xinetd
 Requires(post): /sbin/chkconfig
@@ -26,6 +27,7 @@ require modification to any kernel parts.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -71,18 +73,9 @@ fi
 %{_mandir}/man8/vtund.8*
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 3.0.1-7
-- rebuilt with new openssl
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sun Jan 18 2009 Tomas Mraz <tmraz@redhat.com> 3.0.1-4
-- rebuild with new openssl
-
+* Mon Mar 21 2016 Gabriel Somlo <somlo at cmu.edu> 3.0.1-10
+- patch to fix RHBZ 1319858, 1319860
+- bump release past (el6 & Fedora specific) attempts to add systemd support
 * Mon Nov 17 2008 Gabriel Somlo <somlo at cmu.edu> 3.0.1-3
 - scriptlets fixes
 * Fri Nov 14 2008 Gabriel Somlo <somlo at cmu.edu> 3.0.1-2