diff --git a/SOURCES/setup-2.8.71-fullpath.patch b/SOURCES/setup-2.8.71-fullpath.patch
new file mode 100644
index 0000000..1d5392f
--- /dev/null
+++ b/SOURCES/setup-2.8.71-fullpath.patch
@@ -0,0 +1,50 @@
+diff -urNp setup-2.8.71-orig/bashrc setup-2.8.71/bashrc
+--- setup-2.8.71-orig/bashrc	2016-05-04 14:13:10.974376102 +0200
++++ setup-2.8.71/bashrc	2016-05-04 14:15:20.723433321 +0200
+@@ -67,7 +67,7 @@ if ! shopt -q login_shell ; then # We're
+     # Current threshold for system reserved uid/gids is 200
+     # You could check uidgid reservation validity in
+     # /usr/share/doc/setup-*/uidgid file
+-    if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then
++    if [ $UID -gt 199 ] && [ "`/usr/bin/id -gn`" = "`/usr/bin/id -un`" ]; then
+        umask 002
+     else
+        umask 022
+diff -urNp setup-2.8.71-orig/csh.cshrc setup-2.8.71/csh.cshrc
+--- setup-2.8.71-orig/csh.cshrc	2013-06-07 16:31:32.000000000 +0200
++++ setup-2.8.71/csh.cshrc	2016-05-04 14:16:38.275065224 +0200
+@@ -7,7 +7,7 @@
+ # Current threshold for system reserved uid/gids is 200
+ # You could check uidgid reservation validity in
+ # /usr/share/doc/setup-*/uidgid file
+-if ($uid > 199 && "`id -gn`" == "`id -un`") then
++if ($uid > 199 && "`/usr/bin/id -gn`" == "`/usr/bin/id -un`") then
+     umask 002
+ else
+     umask 022
+diff -urNp setup-2.8.71-orig/profile setup-2.8.71/profile
+--- setup-2.8.71-orig/profile	2013-06-07 16:31:32.000000000 +0200
++++ setup-2.8.71/profile	2016-05-04 14:14:27.289997935 +0200
+@@ -25,10 +25,10 @@ pathmunge () {
+ if [ -x /usr/bin/id ]; then
+     if [ -z "$EUID" ]; then
+         # ksh workaround
+-        EUID=`id -u`
+-        UID=`id -ru`
++        EUID=`/usr/bin/id -u`
++        UID=`/usr/bin/id -ru`
+     fi
+-    USER="`id -un`"
++    USER="`/usr/bin/id -un`"
+     LOGNAME=$USER
+     MAIL="/var/spool/mail/$USER"
+ fi
+@@ -56,7 +56,7 @@ export PATH USER LOGNAME MAIL HOSTNAME H
+ # Current threshold for system reserved uid/gids is 200
+ # You could check uidgid reservation validity in
+ # /usr/share/doc/setup-*/uidgid file
+-if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then
++if [ $UID -gt 199 ] && [ "`/usr/bin/id -gn`" = "`/usr/bin/id -un`" ]; then
+     umask 002
+ else
+     umask 022
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 1f1d655..9174b5a 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.8.71
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
@@ -17,6 +17,7 @@ Patch1: setup-2.8.71-securetty-mainframes.patch
 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
 
 %description
 The setup package contains a set of important system configuration and
@@ -29,6 +30,7 @@ setup files, such as passwd, group, and profile.
 %patch2 -p1 -b .envvar
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 ./shadowconvert.sh
 
@@ -51,6 +53,8 @@ chmod 0644 %{buildroot}/etc/environment
 chmod 0400 %{buildroot}/etc/{shadow,gshadow}
 chmod 0644 %{buildroot}/var/log/lastlog
 touch %{buildroot}/etc/fstab
+touch %{buildroot}/etc/subuid
+touch %{buildroot}/etc/subgid
 
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}/etc/Makefile
@@ -83,6 +87,8 @@ end
 %verify(not md5 size mtime) %config(noreplace) /etc/group
 %verify(not md5 size mtime) %attr(0000,root,root) %config(noreplace,missingok) /etc/shadow
 %verify(not md5 size mtime) %attr(0000,root,root) %config(noreplace,missingok) /etc/gshadow
+%verify(not md5 size mtime) %config(noreplace) /etc/subuid
+%verify(not md5 size mtime) %config(noreplace) /etc/subgid
 %config(noreplace) /etc/services
 %verify(not md5 size mtime) %config(noreplace) /etc/exports
 %config(noreplace) /etc/aliases
@@ -107,6 +113,11 @@ end
 %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
+- add basic empty subuid/subgid files for docker (#1311278)
+- specify full path to utilities in /etc/profile and /etc/bashrc
+  (#1331871)
+
 * Fri May 22 2015 Ondrej Vasik <ovasik@redhat.com> - 2.8.71-6
 - change reservation of 185:185 to jboss user (#1192413)
 - reserve uidgid pair 167:167 for ceph (#1221043)