diff --git a/SOURCES/coreutils-8.22-date-emptyTZ.patch b/SOURCES/coreutils-8.22-date-emptyTZ.patch
new file mode 100644
index 0000000..ca62bc8
--- /dev/null
+++ b/SOURCES/coreutils-8.22-date-emptyTZ.patch
@@ -0,0 +1,46 @@
+From a10acfb1d2118f9a180181d3fed5399dbbe1df3c Mon Sep 17 00:00:00 2001
+From: Pádraig Brady <P@draigBrady.com>
+Date: Tue, 25 Feb 2014 10:58:48 +0000
+Subject: parse-datetime: fix crash or infloop in TZ="" parsing
+
+This was reported in http://bugs.gnu.org/16872
+from the coreutils command: date -d 'TZ="""'
+
+The infinite loop for this case was present since the
+initial TZ="" parsing support in commit de95bdc2 29-10-2004.
+This was changed to a crash or heap corruption depending
+on the platform with commit 2e3e4195 18-01-2010.
+
+* lib/parse-datetime.y (parse_datetime): Break out of the
+TZ="" parsing loop once the second significant " is found.
+Also skip over any subsequent whitespace to be consistent
+with the non TZ= case.
+---
+diff --git a/lib/parse-datetime.y b/lib/parse-datetime.y
+index 6ece765..0ba0a52 100644
+--- a/lib/parse-datetime.y
++++ b/lib/parse-datetime.y
+@@ -1303,8 +1303,6 @@ parse_datetime (struct timespec *result, char const *p,
+             char tz1buf[TZBUFSIZE];
+             bool large_tz = TZBUFSIZE < tzsize;
+             bool setenv_ok;
+-            /* Free tz0, in case this is the 2nd or subsequent time through. */
+-            free (tz0);
+             tz0 = get_tz (tz0buf);
+             z = tz1 = large_tz ? xmalloc (tzsize) : tz1buf;
+             for (s = tzbase; *s != '"'; s++)
+@@ -1316,7 +1314,12 @@ parse_datetime (struct timespec *result, char const *p,
+             if (!setenv_ok)
+               goto fail;
+             tz_was_altered = true;
++
+             p = s + 1;
++            while (c = *p, c_isspace (c))
++              p++;
++
++            break;
+           }
+     }
+ 
+--
+cgit v0.9.0.2
diff --git a/SOURCES/coreutils-8.22-df-autofs.patch b/SOURCES/coreutils-8.22-df-autofs.patch
new file mode 100644
index 0000000..3ac8521
--- /dev/null
+++ b/SOURCES/coreutils-8.22-df-autofs.patch
@@ -0,0 +1,40 @@
+From ed936e1909a314febfdb9574bd10cc2d46d2b3e3 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Fri, 19 Feb 2016 10:41:49 +0100
+Subject: [PATCH] mountlist: recognize autofs-mounted remote file systems, too
+
+Originally reported at: https://bugzilla.redhat.com/1309247
+* lib/mountlist.c (ME_REMOTE): Return true if a file system is named
+"-hosts" because it is used by autofs to mount remote file systems.
+
+Upstream-commit: 781788eeb5d4d0b816698e8629300cd90a7379bd
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ lib/mountlist.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/lib/mountlist.c b/lib/mountlist.c
+index b839cd1..17779f6 100644
+--- a/lib/mountlist.c
++++ b/lib/mountlist.c
+@@ -212,13 +212,15 @@ me_remote (char const *fs_name, char const *fs_type _GL_UNUSED)
+ 
+ #ifndef ME_REMOTE
+ /* A file system is "remote" if its Fs_name contains a ':'
+-   or if (it is of type (smbfs or cifs) and its Fs_name starts with '//').  */
++   or if (it is of type (smbfs or cifs) and its Fs_name starts with '//')
++   or Fs_name is equal to "-hosts" (used by autofs to mount remote fs).  */
+ # define ME_REMOTE(Fs_name, Fs_type)            \
+     (strchr (Fs_name, ':') != NULL              \
+      || ((Fs_name)[0] == '/'                    \
+          && (Fs_name)[1] == '/'                 \
+          && (strcmp (Fs_type, "smbfs") == 0     \
+-             || strcmp (Fs_type, "cifs") == 0)))
++             || strcmp (Fs_type, "cifs") == 0)) \
++     || (strcmp("-hosts", Fs_name) == 0))
+ #endif
+ 
+ #if MOUNTED_GETMNTINFO
+-- 
+2.5.0
+
diff --git a/SOURCES/coreutils-8.22-failingtests.patch b/SOURCES/coreutils-8.22-failingtests.patch
new file mode 100644
index 0000000..7f60046
--- /dev/null
+++ b/SOURCES/coreutils-8.22-failingtests.patch
@@ -0,0 +1,32 @@
+diff -urNp coreutils-8.22-orig/tests/cp/cp-a-selinux.sh coreutils-8.22/tests/cp/cp-a-selinux.sh
+--- coreutils-8.22-orig/tests/cp/cp-a-selinux.sh	2016-06-24 11:44:21.909303666 +0200
++++ coreutils-8.22/tests/cp/cp-a-selinux.sh	2016-06-24 11:47:28.473908346 +0200
+@@ -73,7 +73,8 @@ old_type_d=$(get_selinux_type c_d)
+ # and get the adjusted type for comparison
+ cp -a c Z1 || fail=1
+ cp -a c_d Z1_d || fail=1
+-if restorecon Z1 Z1_d 2>/dev/null; then
++if restorecon Z1 Z1_d 2>restorecon.err \
++   && compare /dev/null restorecon.err; then
+   new_type_f=$(get_selinux_type Z1)
+   new_type_d=$(get_selinux_type Z1_d)
+ 
+diff -urNp coreutils-8.22-orig/tests/local.mk coreutils-8.22/tests/local.mk
+--- coreutils-8.22-orig/tests/local.mk	2016-06-24 11:44:21.920303760 +0200
++++ coreutils-8.22/tests/local.mk	2016-06-24 11:49:31.388965563 +0200
+@@ -117,7 +117,6 @@ all_root_tests =				\
+   tests/df/problematic-chars.sh			\
+   tests/du/bind-mount-dir-cycle.sh		\
+   tests/du/bind-mount-dir-cycle-v2.sh		\
+-  tests/id/setgid.sh				\
+   tests/install/install-C-root.sh		\
+   tests/ls/capability.sh			\
+   tests/ls/nameless-uid.sh			\
+@@ -515,7 +514,6 @@ all_tests =					\
+   tests/id/no-context.sh			\
+   tests/id/context.sh				\
+   tests/id/uid.sh				\
+-  tests/id/setgid.sh				\
+   tests/id/zero.sh				\
+   tests/install/basic-1.sh			\
+   tests/install/create-leading.sh		\
diff --git a/SOURCES/coreutils-8.22-newfilesystems.patch b/SOURCES/coreutils-8.22-newfilesystems.patch
new file mode 100644
index 0000000..f8f0726
--- /dev/null
+++ b/SOURCES/coreutils-8.22-newfilesystems.patch
@@ -0,0 +1,171 @@
+diff -urNp coreutils-8.22-orig/src/fs-is-local.h coreutils-8.22/src/fs-is-local.h
+--- coreutils-8.22-orig/src/fs-is-local.h	2016-06-24 10:59:08.545965484 +0200
++++ coreutils-8.22/src/fs-is-local.h	2016-06-24 11:08:47.435944633 +0200
+@@ -6,6 +6,7 @@ is_local_fs_type (unsigned long int magi
+ {
+   switch (magic)
+     {
++      case S_MAGIC_ACFS: return 0;
+       case S_MAGIC_ADFS: return 1;
+       case S_MAGIC_AFFS: return 1;
+       case S_MAGIC_AFS: return 0;
+@@ -15,13 +16,16 @@ is_local_fs_type (unsigned long int magi
+       case S_MAGIC_BEFS: return 1;
+       case S_MAGIC_BDEVFS: return 1;
+       case S_MAGIC_BFS: return 1;
++      case S_MAGIC_BPF_FS: return 1;
+       case S_MAGIC_BINFMTFS: return 1;
+       case S_MAGIC_BTRFS: return 1;
++      case S_MAGIC_BTRFS_TEST: return 1;
+       case S_MAGIC_CEPH: return 0;
+       case S_MAGIC_CGROUP: return 1;
+       case S_MAGIC_CIFS: return 0;
+       case S_MAGIC_CODA: return 0;
+       case S_MAGIC_COH: return 1;
++      case S_MAGIC_CONFIGFS: return 1;
+       case S_MAGIC_CRAMFS: return 1;
+       case S_MAGIC_CRAMFS_WEND: return 1;
+       case S_MAGIC_DEBUGFS: return 1;
+@@ -43,10 +47,13 @@ is_local_fs_type (unsigned long int magi
+       case S_MAGIC_GFS: return 0;
+       case S_MAGIC_GPFS: return 0;
+       case S_MAGIC_HFS: return 1;
++      case S_MAGIC_HFS_PLUS: return 1;
++      case S_MAGIC_HFS_X: return 1;
+       case S_MAGIC_HOSTFS: return 1;
+       case S_MAGIC_HPFS: return 1;
+       case S_MAGIC_HUGETLBFS: return 1;
+       case S_MAGIC_MTD_INODE_FS: return 1;
++      case S_MAGIC_IBRIX: return 0;
+       case S_MAGIC_INOTIFYFS: return 1;
+       case S_MAGIC_ISOFS: return 1;
+       case S_MAGIC_ISOFS_R_WIN: return 1;
+@@ -55,7 +62,9 @@ is_local_fs_type (unsigned long int magi
+       case S_MAGIC_JFFS2: return 1;
+       case S_MAGIC_JFS: return 1;
+       case S_MAGIC_KAFS: return 0;
++      case S_MAGIC_LOGFS: return 1;
+       case S_MAGIC_LUSTRE: return 0;
++      case S_MAGIC_M1FS: return 1;
+       case S_MAGIC_MINIX: return 1;
+       case S_MAGIC_MINIX_30: return 1;
+       case S_MAGIC_MINIX_V2: return 1;
+@@ -67,11 +75,14 @@ is_local_fs_type (unsigned long int magi
+       case S_MAGIC_NFS: return 0;
+       case S_MAGIC_NFSD: return 0;
+       case S_MAGIC_NILFS: return 1;
++      case S_MAGIC_NSFS: return 1;
+       case S_MAGIC_NTFS: return 1;
+       case S_MAGIC_OPENPROM: return 1;
+       case S_MAGIC_OCFS2: return 0;
++      case S_MAGIC_OVERLAYFS: return 0;
+       case S_MAGIC_PANFS: return 0;
+       case S_MAGIC_PIPEFS: return 0;
++      case S_MAGIC_PRL_FS: return 0;
+       case S_MAGIC_PROC: return 1;
+       case S_MAGIC_PSTOREFS: return 1;
+       case S_MAGIC_QNX4: return 1;
+@@ -91,6 +101,7 @@ is_local_fs_type (unsigned long int magi
+       case S_MAGIC_SYSV2: return 1;
+       case S_MAGIC_SYSV4: return 1;
+       case S_MAGIC_TMPFS: return 1;
++      case S_MAGIC_TRACEFS: return 1;
+       case S_MAGIC_UBIFS: return 1;
+       case S_MAGIC_UDF: return 1;
+       case S_MAGIC_UFS: return 1;
+diff -urNp coreutils-8.22-orig/src/stat.c coreutils-8.22/src/stat.c
+--- coreutils-8.22-orig/src/stat.c	2013-12-13 15:12:46.000000000 +0100
++++ coreutils-8.22/src/stat.c	2016-06-24 11:16:37.853990792 +0200
+@@ -311,13 +311,13 @@ human_fstype (STRUCT_STATVFS const *stat
+       return "fusectl";
+     case S_MAGIC_FUTEXFS: /* 0x0BAD1DEA local */
+       return "futexfs";
+-    case S_MAGIC_GFS: /* 0x1161970 remote */
++    case S_MAGIC_GFS: /* 0x01161970 remote */
+       return "gfs/gfs2";
+     case S_MAGIC_GPFS: /* 0x47504653 remote */
+       return "gpfs";
+     case S_MAGIC_HFS: /* 0x4244 local */
+       return "hfs";
+-    case S_MAGIC_HOSTFS: /* 0xC0FFEE local */
++    case S_MAGIC_HOSTFS: /* 0x00C0FFEE local */
+       return "hostfs";
+     case S_MAGIC_HPFS: /* 0xF995E849 local */
+       return "hpfs";
+@@ -369,7 +369,7 @@ human_fstype (STRUCT_STATVFS const *stat
+       return "ntfs";
+     case S_MAGIC_OPENPROM: /* 0x9FA1 local */
+       return "openprom";
+-    case S_MAGIC_OCFS2: /* 0x7461636f remote */
++    case S_MAGIC_OCFS2: /* 0x7461636F remote */
+       return "ocfs2";
+     case S_MAGIC_PANFS: /* 0xAAD7AAEA remote */
+       return "panfs";
+@@ -430,7 +430,9 @@ human_fstype (STRUCT_STATVFS const *stat
+       return "v9fs";
+     case S_MAGIC_VMHGFS: /* 0xBACBACBC remote */
+       return "vmhgfs";
+-    case S_MAGIC_VXFS: /* 0xA501FCF5 local */
++    case S_MAGIC_VXFS: /* 0xA501FCF5 remote */
++       /* Veritas File System can run in single instance or clustered mode,
++          so mark as remote to cater for the latter case.  */
+       return "vxfs";
+     case S_MAGIC_VZFS: /* 0x565A4653 local */
+       return "vzfs";
+@@ -444,6 +446,37 @@ human_fstype (STRUCT_STATVFS const *stat
+       return "xia";
+     case S_MAGIC_ZFS: /* 0x2FC12FC1 local */
+       return "zfs";
++/*  Refresh from coreutils-8.25 bellow  */
++    case S_MAGIC_ACFS: /* 0x61636673 remote */
++      return "acfs";
++    case S_MAGIC_BPF_FS: /* 0xCAFE4A11 local */
++      return "bpf_fs";
++    case S_MAGIC_BTRFS_TEST: /* 0x73727279 local */
++      return "btrfs_test";
++    case S_MAGIC_CONFIGFS: /* 0x62656570 local */
++      return "configfs";
++    case S_MAGIC_HFS_PLUS: /* 0x482B local */
++      return "hfs+";
++    case S_MAGIC_HFS_X: /* 0x4858 local */
++      return "hfsx";
++    case S_MAGIC_IBRIX: /* 0x013111A8 remote */
++      return "ibrix";
++    case S_MAGIC_LOGFS: /* 0xC97E8168 local */
++      return "logfs";
++    case S_MAGIC_M1FS: /* 0x5346314D local */
++      return "m1fs";
++    case S_MAGIC_NSFS: /* 0x6E736673 local */
++      return "nsfs";
++    case S_MAGIC_OVERLAYFS: /* 0x794C7630 remote */
++       /* This may overlay remote file systems.
++          Also there have been issues reported with inotify and overlayfs,
++          so mark as "remote" so that polling is used.  */
++      return "overlayfs";
++    case S_MAGIC_PRL_FS: /* 0x7C7C6673 remote */
++      return "prl_fs";
++    case S_MAGIC_TRACEFS: /* 0x74726163 local */
++      return "tracefs";
++
+ 
+ # elif __GNU__
+     case FSTYPE_UFS:
+diff -urNp coreutils-8.22-orig/src/tail.c coreutils-8.22/src/tail.c
+--- coreutils-8.22-orig/src/tail.c	2013-12-09 14:40:46.000000000 +0100
++++ coreutils-8.22/src/tail.c	2016-06-24 11:03:10.268044584 +0200
+@@ -898,13 +898,15 @@ fremote (int fd, const char *name)
+         case 0:
+           break;
+         case -1:
++#if 0
+           {
+             unsigned long int fs_type = buf.f_type;
+             error (0, 0, _("unrecognized file system type 0x%08lx for %s. "
+                            "please report this to %s. reverting to polling"),
+                    fs_type, quote (name), PACKAGE_BUGREPORT);
+             /* Treat as "remote", so caller polls.  */
+           }
++#endif
+           break;
+         case 1:
+           remote = false;
diff --git a/SOURCES/coreutils-8.22-sort-blanks.patch b/SOURCES/coreutils-8.22-sort-blanks.patch
new file mode 100644
index 0000000..a950ffc
--- /dev/null
+++ b/SOURCES/coreutils-8.22-sort-blanks.patch
@@ -0,0 +1,35 @@
+From 3976ef5a20369d8b490907ab2cba2d617305a5e0 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 30 May 2016 16:19:20 +0200
+Subject: [PATCH] sort: do not use static array 'blanks' in human_numcompare()
+
+... because the array is not initialized with MB locales.  Note this is
+rather a conservative fix.  I plan to do more cleanup of the i18n patch
+in Fedora to prevent mistakes like this in future updates of coreutils.
+---
+ src/sort.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/src/sort.c b/src/sort.c
+index 9e07ad8..e47b039 100644
+--- a/src/sort.c
++++ b/src/sort.c
+@@ -2275,12 +2275,10 @@ find_unit_order (char const *number)
+        <none/unknown> < K/k < M < G < T < P < E < Z < Y  */
+ 
+ static int
+-human_numcompare (char const *a, char const *b)
++human_numcompare (char *a, char *b)
+ {
+-  while (blanks[to_uchar (*a)])
+-    a++;
+-  while (blanks[to_uchar (*b)])
+-    b++;
++  skipblanks(&a, a + strlen(a));
++  skipblanks(&b, b + strlen(b));
+ 
+   int diff = find_unit_order (a) - find_unit_order (b);
+   return (diff ? diff : strnumcmp (a, b, decimal_point, thousands_sep));
+-- 
+2.5.5
+
diff --git a/SOURCES/coreutils-8.22-xfsbuildfailure.patch b/SOURCES/coreutils-8.22-xfsbuildfailure.patch
new file mode 100644
index 0000000..4a0d43a
--- /dev/null
+++ b/SOURCES/coreutils-8.22-xfsbuildfailure.patch
@@ -0,0 +1,93 @@
+From eafaa2e88f7af16756142a31ab63d032b31395e3 Mon Sep 17 00:00:00 2001
+From: Pádraig Brady <P@draigBrady.com>
+Date: Fri, 06 Nov 2015 16:31:22 +0000
+Subject: tests: fix dirent d_type support verification
+
+* tests/d_type-check: Check also the d_type of files,
+which excludes XFS appropriately.  Specify all argument
+and return types to avoid truncated pointers being passed,
+which skipped the test due to crashes on x86_64 at least.
+Simplify the C library lookup by reusing the interpreter's.
+
+chroot issue reported at https://bugzilla.redhat.com/1263341
+---
+diff --git a/tests/d_type-check b/tests/d_type-check
+index ff1eb60..1a2f76f 100644
+--- a/tests/d_type-check
++++ b/tests/d_type-check
+@@ -1,13 +1,17 @@
+ #!/usr/bin/python
+-# Exit 0 if "." has useful d_type information, else 1.
++# Exit 0 if "." and "./tempfile" have useful d_type information, else 1.
+ # Intended to exit 0 only on Linux/GNU systems.
++import os
+ import sys
++import tempfile
+ 
+ fail = 1
++fname = None
++
+ try:
+   import ctypes
+ 
+-  (DT_UNKNOWN, DT_DIR,) = (0, 4,)
++  (DT_UNKNOWN, DT_DIR, DT_REG) = (0, 4, 8)
+ 
+   class dirent(ctypes.Structure):
+     _fields_ = [
+@@ -17,20 +21,48 @@ try:
+       ("d_type", ctypes.c_ubyte),
+       ("d_name", ctypes.c_char*256)]
+ 
++  # Pass NULL to dlopen, assuming the python
++  # interpreter is linked with the C runtime
++  libc = ctypes.CDLL(None)
++
++  # Setup correct types for all args and returns
++  # even if only passing, to avoid truncation etc.
++  dirp = ctypes.c_void_p
+   direntp = ctypes.POINTER(dirent)
+ 
+-  # FIXME: find a way to avoid hard-coding libc's so-name.
+-  libc = ctypes.cdll.LoadLibrary("libc.so.6")
++  libc.readdir.argtypes = [dirp]
+   libc.readdir.restype = direntp
+ 
++  libc.opendir.restype = dirp
++
++  # Ensure a file is present
++  f, fname = tempfile.mkstemp(dir='.')
++  fname = os.path.basename(fname)
++
+   dirp = libc.opendir(".")
+   if dirp:
+-    ep = libc.readdir(dirp)
+-    if ep:
++    while True:
++      ep = libc.readdir(dirp)
++      if not ep: break
++      d_type = ep.contents.d_type
+       name = ep.contents.d_name
+-      if (name == "." or name == "..") and ep.contents.d_type == DT_DIR:
++      if name == "." or name == "..":
++        if d_type != DT_DIR: break
++      # Check files too since on XFS, only dirs have DT_DIR
++      # while everything else has DT_UNKNOWN
++      elif name == fname:
++        if d_type == DT_REG:
++          fail = 0
++        break
++      elif d_type != DT_DIR and d_type != DT_UNKNOWN:
+         fail = 0
++        break
++except:
++  pass
+ 
++try:
++  if fname:
++    os.unlink(fname);
+ except:
+   pass
+ 
+--
+cgit v0.9.0.2
diff --git a/SOURCES/coreutils-colorls.sh b/SOURCES/coreutils-colorls.sh
index cfd2288..ac92268 100755
--- a/SOURCES/coreutils-colorls.sh
+++ b/SOURCES/coreutils-colorls.sh
@@ -1,7 +1,7 @@
 # color-ls initialization
 
 # Skip all for noninteractive shells.
-[ -z "$PS1" ] && return
+[ ! -t 0 ] && return
 
 #when USER_LS_COLORS defined do not override user LS_COLORS, but use them.
 if [ -z "$USER_LS_COLORS" ]; then
diff --git a/SPECS/coreutils.spec b/SPECS/coreutils.spec
index 0a38777..88e6478 100644
--- a/SPECS/coreutils.spec
+++ b/SPECS/coreutils.spec
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 8.22
-Release: 15%{?dist}.1
+Release: 18%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -33,6 +33,14 @@ Patch8: coreutils-8.22-df-getdisk.patch
 Patch9: coreutils-8.22-df-filtermountlistupdate.patch
 #Prevent potential corruption of sparse files in cp
 Patch10: coreutils-8.22-cp-sparsecorrupt.patch
+#improve dirent d_type support verification (xfs build failure, #1263341)
+Patch11: coreutils-8.22-xfsbuildfailure.patch
+#Update filesystem magic lists from latest upstream (coreutils-8.25)
+Patch12: coreutils-8.22-newfilesystems.patch
+#Fix crash in date with empty TZ envvar
+Patch13: coreutils-8.22-date-emptyTZ.patch
+#df -l: do not hang on a dead autofs mount point (#1309247)
+Patch14: coreutils-8.22-df-autofs.patch 
 
 # Our patches
 #general patch to workaround koji build system issues
@@ -53,6 +61,8 @@ Patch108: coreutils-8.22-ppc64le.patch
 Patch109: coreutils-8.22-id-groups.patch
 #fix some non-default tests failing in beaker environment(#1247641)
 Patch110: coreutils-8.22-non-defaulttests.patch
+#Fix sort -h for other than first field
+Patch111: coreutils-8.22-sort-blanks.patch
 
 # sh-utils
 #add info about TZ envvar to date manpage
@@ -68,6 +78,9 @@ Patch908: coreutils-getgrouplist.patch
 Patch912: coreutils-overflow.patch
 #Temporarily disable df symlink test, failing
 Patch913: coreutils-8.22-temporarytestoff.patch
+#Disable id/setgid.sh test, fix false positive failure of cp-a-selinux test 
+# (#1266501, #1266500)
+Patch914: coreutils-8.22-failingtests.patch
 
 #SELINUX Patch - implements Redhat changes
 #(upstream did some SELinux implementation unlike with RedHat patch)
@@ -159,6 +172,10 @@ the old GNU fileutils, sh-utils, and textutils packages.
 %patch8 -p1 -b .getdisk
 %patch9 -p1 -b .findmnt
 %patch10 -p1 -b .sparse
+%patch11 -p1 -b .d_type
+%patch12 -p1 -b .newfs
+%patch13 -p1 -b .emptytz
+%patch14 -p1 -b .df-autofs
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -170,6 +187,7 @@ the old GNU fileutils, sh-utils, and textutils packages.
 %patch108 -p1 -b .ppc64le
 %patch109 -p1 -b .groups
 %patch110 -p1 -b .nondefault
+%patch111 -p1 -b .blanks
 
 # sh-utils
 %patch703 -p1 -b .dateman
@@ -182,6 +200,7 @@ the old GNU fileutils, sh-utils, and textutils packages.
 %patch908 -p1 -b .getgrouplist
 %patch912 -p1 -b .overflow
 %patch913 -p1 -b .testoff
+%patch914 -p1 -b .testfail
 
 #SELinux
 %patch950 -p1 -b .selinux
@@ -211,6 +230,8 @@ automake --copy --add-missing
 
 # Regenerate manpages
 touch man/*.x
+# Do not regenerate fs-is-local.h
+touch src/fs-is-local.h
 
 make all %{?_smp_mflags}
 
@@ -409,8 +430,21 @@ fi
 %{_sbindir}/chroot
 
 %changelog
-* Wed Nov 25 2015 Ondrej Vasik <ovasik@redhat.com> - 8.22-15.1
-- cp: prevent potential sparse file corruption (#1285365)
+* Fri Jul 01 2016 Ondrej Vasik <ovasik@redhat.com> - 8.22-18
+- fix xfs build failure in chrooted environment (#1263341)
+- update filesystem lists for stat and tail from latest upstream
+  (#1327881, #1280357) 
+- disable id/setgid.sh test(missing chroot feature), fix 
+  cp-a-selinux test (#1266500,#1266501)
+- colorls.sh - change detection of interactive shell for ksh
+  compatibility (#1321648)
+- fix date --date crash with empty or invalid TZ envvar (#1325786)
+- df -l: do not hang on a dead autofs mount point (#1309247)
+- sort -h: fix functionality of human readable numeric sort for other
+  than first field (#1328360)
+
+* Wed Nov 25 2015 Ondrej Vasik <ovasik@redhat.com> - 8.22-16
+- cp: prevent potential sparse file corruption (#1284906)
 
 * Sat Sep 12 2015 Ondrej Vasik <ovasik@redhat.com> - 8.22-15
 - fix one more occurance of non-full path in colorls.sh (#1222223)