diff --git a/SOURCES/setup-2.8.71-filesystems.patch b/SOURCES/setup-2.8.71-filesystems.patch
new file mode 100644
index 0000000..94ba5ea
--- /dev/null
+++ b/SOURCES/setup-2.8.71-filesystems.patch
@@ -0,0 +1,13 @@
+diff -urNp setup-2.8.71-orig/filesystems setup-2.8.71/filesystems
+--- setup-2.8.71-orig/filesystems 2013-06-07 16:31:32.000000000 +0200
++++ setup-2.8.71/filesystems 2014-08-15 10:05:11.378148035 +0200
+@@ -1,3 +1,4 @@
++xfs
+ ext4
+ ext3
+ ext2
+@@ -7,3 +8,4 @@ iso9660
+ vfat
+ hfs
+ hfsplus
++*
diff --git a/SOURCES/setup-2.8.71-uidgidchanges.patch b/SOURCES/setup-2.8.71-uidgidchanges.patch
new file mode 100644
index 0000000..d2f4515
--- /dev/null
+++ b/SOURCES/setup-2.8.71-uidgidchanges.patch
@@ -0,0 +1,17 @@
+diff -urNp setup-2.8.71-orig/uidgid setup-2.8.71/uidgid
+--- setup-2.8.71-orig/uidgid 2013-06-07 16:31:32.000000000 +0200
++++ setup-2.8.71/uidgid 2014-08-15 09:59:45.423988877 +0200
+@@ -121,6 +121,7 @@ cimsrvr 134 134 / /sbin/nologin tog-peg
+ mock - 135 / - mock
+ ricci 140 140 /var/lib/ricci /sbin/nologin ricci
+ luci 141 141 /var/lib/luci /sbin/nologin luci
++activemq 142 142 /usr/share/activemq /sbin/nologin activemq
+ stap-server 155 155 /var/lib/stap-server /sbin/nologin systemtap
+ stapusr - 156 / - systemtap-runtime
+ stapsys - 157 / - systemtap-runtime
+@@ -160,4 +161,4 @@ gnats ? ? ? ? gnats, gnats-db
+ listar ? ? ? ? listar
+ nfsnobody 65534 65534 /var/lib/nfs /sbin/nologin nfs-utils
+
+-# Note: nfsnobdy is 4294967294 on 64-bit platforms (-2)
++# Note: nfsnobody is 4294967294 on 64-bit platforms (-2)
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index b7f67f0..ab9f340 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: 4%{?dist}
+Release: 5%{?dist}
License: Public Domain
Group: System Environment/Base
URL: https://fedorahosted.org/setup/
@@ -15,6 +15,8 @@ Conflicts: initscripts < 4.26, bash <= 2.0.4-21
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
%description
The setup package contains a set of important system configuration and
@@ -25,6 +27,8 @@ setup files, such as passwd, group, and profile.
%patch1 -p1 -b .mainframe
%patch2 -p1 -b .envvar
+%patch3 -p1
+%patch4 -p1
./shadowconvert.sh
@@ -57,6 +61,7 @@ rm -f %{buildroot}/etc/setup.spec
# remove the "originals" of patched files
rm -f %{buildroot}/etc/securetty.mainframe
rm -f %{buildroot}/etc/bashrc.envvar
+rm -f %{buildroot}/etc/*.orig
%clean
rm -rf %{buildroot}
@@ -102,6 +107,11 @@ end
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
%changelog
+* Fri Aug 15 2014 Ondrej Vasik <ovasik@redhat.com> - 2.8.71-5
+- reserve uidgid pair 142:142 for activemq (#1086923)
+- add xfs to /etc/filesystems, fallback to /proc/filesystems
+ (#1123832)
+
* Wed Mar 12 2014 Ondrej Vasik <ovasik@redhat.com> - 2.8.71-4
- require system-release for saner dependency order (#1075578)