diff --git a/SOURCES/setup-2.8.71-shlocal.patch b/SOURCES/setup-2.8.71-shlocal.patch
new file mode 100644
index 0000000..e56250f
--- /dev/null
+++ b/SOURCES/setup-2.8.71-shlocal.patch
@@ -0,0 +1,24 @@
+diff -urNp setup-2.8.71-orig/csh.login setup-2.8.71/csh.login
+--- setup-2.8.71-orig/csh.login	2013-06-07 16:31:32.000000000 +0200
++++ setup-2.8.71/csh.login	2017-11-17 09:36:56.353503683 +0100
+@@ -22,7 +22,7 @@ set history=1000
+ 
+ if ( -d /etc/profile.d ) then
+         set nonomatch
+-        foreach i ( /etc/profile.d/*.csh )
++        foreach i ( /etc/profile.d/*.csh /etc/profile.d/csh.local )
+                 if ( -r "$i" ) then
+ 	                        if ($?prompt) then
+ 	                              source "$i"
+diff -urNp setup-2.8.71-orig/profile setup-2.8.71/profile
+--- setup-2.8.71-orig/profile	2017-11-17 09:35:43.584674057 +0100
++++ setup-2.8.71/profile	2017-11-17 09:36:30.892213403 +0100
+@@ -62,7 +62,7 @@ else
+     umask 022
+ fi
+ 
+-for i in /etc/profile.d/*.sh ; do
++for i in /etc/profile.d/*.sh /etc/profile.d/sh.local ; do
+     if [ -r "$i" ]; then
+         if [ "${-#*i}" != "$-" ]; then 
+             . "$i"
diff --git a/SOURCES/setup-2.8.71-tapeid.patch b/SOURCES/setup-2.8.71-tapeid.patch
new file mode 100644
index 0000000..2d910c7
--- /dev/null
+++ b/SOURCES/setup-2.8.71-tapeid.patch
@@ -0,0 +1,12 @@
+diff -urNp setup-2.8.71-orig/group setup-2.8.71/group
+--- setup-2.8.71-orig/group	2017-08-31 10:09:47.179007135 +0200
++++ setup-2.8.71/group	2017-08-31 10:10:19.823124046 +0200
+@@ -15,7 +15,7 @@ man:x:15:
+ dialout::18:
+ floppy::19:
+ games::20:
+-tape::30:
++tape::33:
+ video::39:
+ ftp::50:
+ lock::54:
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 9174b5a..317132b 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -1,11 +1,11 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.8.71
-Release: 7%{?dist}
+Release: 9%{?dist}
 License: Public Domain
 Group: System Environment/Base
-URL: https://fedorahosted.org/setup/
-Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2
+URL: https://pagure.io/setup/
+Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
 BuildArch: noarch
 BuildRequires: bash tcsh perl
 #require system release for saner dependency order
@@ -18,6 +18,8 @@ Patch2: setup-2.8.71-bashrc-shellvar.patch
 Patch3: setup-2.8.71-uidgidchanges.patch
 Patch4: setup-2.8.71-filesystems.patch
 Patch5: setup-2.8.71-fullpath.patch
+Patch6: setup-2.8.71-tapeid.patch
+Patch7: setup-2.8.71-shlocal.patch
 
 %description
 The setup package contains a set of important system configuration and
@@ -31,6 +33,8 @@ setup files, such as passwd, group, and profile.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 ./shadowconvert.sh
 
@@ -55,6 +59,10 @@ chmod 0644 %{buildroot}/var/log/lastlog
 touch %{buildroot}/etc/fstab
 touch %{buildroot}/etc/subuid
 touch %{buildroot}/etc/subgid
+mkdir -p %{buildroot}/etc/profile.d
+echo "#Add any required envvar overrides to this file, it is sourced from /etc/profile" >%{buildroot}/etc/profile.d/sh.local
+echo "#Add any required envvar overrides to this file, is sourced from /etc/csh.login" >%{buildroot}/etc/profile.d/csh.local
+
 
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}/etc/Makefile
@@ -108,12 +116,22 @@ end
 %config(noreplace) /etc/csh.login
 %config(noreplace) /etc/csh.cshrc
 %dir /etc/profile.d
+%config(noreplace) /etc/profile.d/sh.local
+%config(noreplace) /etc/profile.d/csh.local
 %config(noreplace) %verify(not md5 size mtime) /etc/shells
 %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
 
 %changelog
-* Wed May 03 2016 Ondrej Vasik <ovasik@redhat.com> - 2.8.71-7
+* Wed Nov 22 2017 Ondrej Vasik <ovasik@redhat.com> - 2.8.71-9
+- change the URL of the upstream (#1502427)
+
+* Fri Nov 17 2017 Ondrej Vasik <ovasik@redhat.com> - 2.8.71-8
+- fix group id for tape in /etc/group (should be 33) (#1433020)
+- provide a way how to override set envvars through sh.local file(#1344007)
+- provide a way how to override set ennvars through csh.local file
+
+* Wed May 04 2016 Ondrej Vasik <ovasik@redhat.com> - 2.8.71-7
 - add basic empty subuid/subgid files for docker (#1311278)
 - specify full path to utilities in /etc/profile and /etc/bashrc
   (#1331871)