diff --git a/.gitignore b/.gitignore
index 7935b67..e17d0f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /hitch-00b264b5537986fecfa1013cc27ad3b7b771a646.tar.gz
 /hitch-b1ee595d7803dbdd403b554eb4ec0416d00efeb3.tar.gz
 /hitch-adca8d96fa16de1f2e66717ec2b7c95b772a1204.tar.gz
+/hitch-1.0.1.tar.gz
diff --git a/hitch.initrc.redhat.patch b/hitch.initrc.redhat.patch
index 490f796..05e12e0 100644
--- a/hitch.initrc.redhat.patch
+++ b/hitch.initrc.redhat.patch
@@ -29,8 +29,8 @@ diff -Naur ../hitch-00b264b5537986fecfa1013cc27ad3b7b771a646.orig/hitch.initrc.r
 +pidfile="/var/run/hitch/hitch.pid"
 +lockfile="/var/lock/subsys/hitch"
 +config="/etc/hitch/hitch.conf"
-+exec="/usr/sbin/hitch-openssl"
-+prog="hitch-openssl"
++exec="/usr/sbin/hitch"
++prog="hitch"
 +
 +
 +start() {
diff --git a/hitch.spec b/hitch.spec
index aa14ce3..9c5b55e 100644
--- a/hitch.spec
+++ b/hitch.spec
@@ -1,5 +1,5 @@
-%global	commit		adca8d96fa16de1f2e66717ec2b7c95b772a1204
-%global	shortcommit	%(c=%{commit}; echo ${c:0:7})
+#% global	commit		adca8d96fa16de1f2e66717ec2b7c95b772a1204
+#% global	shortcommit	% (c=% {commit}; echo ${c:0:7})
 
 # Checks may only be ran from a host with internet connection
 #% global runcheck	0
@@ -13,14 +13,14 @@
 %global _hardened_build 1
 
 Name:		hitch
-Version:	1.0.0
-Release:	0.5.1.beta5%{?dist}
+Version:	1.0.1
+Release:	1%{?dist}
 Summary:	Network proxy that terminates TLS/SSL connections
 
 Group:		System Environment/Daemons
 License:	BSD
-URL:		https://github.com/varnish/hitch
-Source0:	https://github.com/varnish/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
+URL:		https://hitch-tls.org/
+Source0:	https://hitch-tls.org/source/%{name}-%{version}.tar.gz
 
 BuildRequires:	libev-devel
 BuildRequires:	openssl-devel
@@ -30,6 +30,7 @@ Requires:	openssl
 
 Patch0:		hitch.systemd.service.patch
 Patch1:		hitch.initrc.redhat.patch
+Patch3:		hitch-1.0.1_tests_nobody_group.patch
 Patch4:		hitch.test07_missing_curl_resolve_on_el6.patch
 
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
@@ -47,16 +48,16 @@ unencrypted traffic to some backend. It is designed to handle 10s of thousands
 of connections efficiently on multicore machines.
 
 %prep
-%setup -qn %{name}-%{commit}
+%setup -q
 %patch0
 %patch1
+%patch3
 %if 0%{?rhel} == 6
 %patch4
 %endif
 
-
 %build
-./bootstrap
+#./bootstrap
 
 %if 0%{?rhel} == 6
 CFLAGS="%{optflags} -fPIE"
@@ -69,12 +70,14 @@ export CPPFLAGS
 
 %configure
 make %{?_smp_mflags}
-sed -i 's/nogroup/nobody/g' src/tests/configs/test08*.cfg
+#sed -i 's/nogroup/nobody/g' src/tests/configs/test08*.cfg
 
 
 %install
-%make_install
-sed '
+echo %_docdir
+
+%make_install DOCDIR=%{buildroot}%{_docdir}
+sed   '
 	s/user = ""/user = "%{hitch_user}"/g;
 	s/group = ""/group = "%{hitch_group}"/g;
 	s/backend = "\[127.0.0.1\]:8000"/backend = "[127.0.0.1]:6081"/g;
@@ -83,6 +86,8 @@ sed '
 %if 0%{?rhel} == 6
 	sed -i 's/daemon = off/daemon = on/g;' hitch.conf
 %endif
+rm -f %{buildroot}%{_datarootdir}/doc/%{name}/hitch.conf.ex
+
 install -p -D -m 0644 hitch.conf %{buildroot}%{_sysconfdir}/hitch/hitch.conf
 install -d -m 0755 %{buildroot}%{hitch_homedir}
 install -d -m 0755 %{buildroot}%{hitch_datadir}
@@ -131,12 +136,13 @@ useradd -r -g %{hitch_group} -s /sbin/nologin -d %{hitch_homedir} %{hitch_user} 
 
 %files
 %doc README.md
+%doc hitch.conf.ex
 %if 0%{?rhel} == 6
 %doc LICENSE
 %else
 %license LICENSE
 %endif
-%{_sbindir}/hitch-openssl
+%{_sbindir}/%{name}
 %{_mandir}/man8/hitch.8*
 %dir %{_sysconfdir}/hitch
 %config(noreplace) %{_sysconfdir}/hitch/hitch.conf
@@ -153,6 +159,12 @@ useradd -r -g %{hitch_group} -s /sbin/nologin -d %{hitch_homedir} %{hitch_user} 
 
 
 %changelog
+* Thu Oct 15 2015 Ingvar Hagelund <ingvar@redpill-linpro.com> 1.0.1-1
+- New upstream release
+- New Home and Source0 URLs
+- Rebased patches
+- Changed initrc and systemd start up scripts to match new binary name
+
 * Tue Aug 04 2015 Ingvar Hagelund <ingvar@redpill-linpro.com> 1.0.0-0.5.1.beta5
 - New upstream beta
 - Dropped patch3 and patch5, they are fixed in upstream
diff --git a/hitch.systemd.service.patch b/hitch.systemd.service.patch
index 40b5ec0..ef21e35 100644
--- a/hitch.systemd.service.patch
+++ b/hitch.systemd.service.patch
@@ -23,7 +23,7 @@ diff -Naur ../hitch-00b264b5537986fecfa1013cc27ad3b7b771a646.orig/hitch.service 
 +
 +Type=simple
 +PrivateTmp=true
-+ExecStart=/usr/sbin/hitch-openssl --pidfile=/run/hitch/hitch.pid --config=/etc/hitch/hitch.conf
++ExecStart=/usr/sbin/hitch --pidfile=/run/hitch/hitch.pid --config=/etc/hitch/hitch.conf
 +
 +
 +[Install]
diff --git a/sources b/sources
index c06682b..61e15d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bcc41041405fa520f38fff1f070e8af9  hitch-adca8d96fa16de1f2e66717ec2b7c95b772a1204.tar.gz
+12389cbe3a1185ca24d8c9183cd99c08  hitch-1.0.1.tar.gz