diff --git a/SOURCES/setup-2.8.71-uidgidchanges.patch b/SOURCES/setup-2.8.71-uidgidchanges.patch
index d2f4515..e32a41b 100644
--- a/SOURCES/setup-2.8.71-uidgidchanges.patch
+++ b/SOURCES/setup-2.8.71-uidgidchanges.patch
@@ -1,15 +1,48 @@
 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
+@@ -22,7 +22,7 @@ games	12	(100)	/usr/games		/sbin/nologin
+ gopher	13	30	/var/gopher		/sbin/nologin	-(not created by default)
+ ftp	14	50	/var/ftp		/sbin/nologin	setup
+ man	-	15	-		-	setup
+-oprofile	16	16	/home/oprofile		/sbin/nologin	oprofile
++oprofile	16	16	/var/lib/oprofile		/sbin/nologin	oprofile
+ pkiuser	17	17	/usr/share/pki		/sbin/nologin	pki-ca,rhpki-ca
+ dialout	-	18	-		-	setup
+ floppy	-	19	-		-	setup
 @@ -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
++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
+@@ -132,6 +133,7 @@ keystone	163	163	/var/lib/keystone		/sbi
+ quantum	164	164	/var/lib/quantum		/sbin/nologin	openstack-quantum
+ cinder	165	165	/var/lib/cinder		/sbin/nologin	openstack-cinder
+ ceilometer	166	166	/var/lib/ceilometer		/sbin/nologin	openstack-ceilometer
++ceph	167	167	/var/lib/ceph		/sbin/nologin	ceph-common
+ avahi-autoipd	170	170	/var/lib/avahi-autoipd		/sbin/nologin	avahi
+ pulse	171	171	/var/run/pulse		/sbin/nologin	pulseaudio
+ rtkit	172	172	/proc		/sbin/nologin	rtkit
+@@ -147,7 +149,7 @@ wallaby	181	181	/var/lib/wallaby		/sbin/
+ katello	182	182	/usr/share/katello		/sbin/nologin	katello-common
+ elasticsearch	183	183	/usr/share/java/elasticsearch		/sbin/nologin	elasticsearch
+ mongodb	184	184	/var/lib/mongodb		/sbin/nologin	mongodb
+-jboss-as	185	185	/usr/share/jboss-as		/sbin/nologin	jboss-as
++jboss	185	185	/var/lib/jbossas		/sbin/nologin	jbossas-core	#was jboss-as and wildfly
+ jbosson-agent	186	-	/		/sbin/nologin	jboss-on-agent
+ jbosson	-	186	-		-	jboss-on-agent
+ heat	187	187	/var/lib/heat		/sbin/nologin	heat
+@@ -156,8 +158,11 @@ haproxy	188	188	/var/lib/haproxy		/sbin/
+ haclient	-	189	-		-	pacemaker
+ systemd-journal	-	190	-		-	systemd
+ systemd-journal-gateway	191	191	/		/sbin/nologin	systemd
++#systemd-journal-gateway dynamic on new systems (may have different uid/gid)
++systemd-network	192	192	/		/sbin/nologin	systemd
++systemd-resolve	193	193	/		/sbin/nologin	systemd
+ gnats	?	?	?		?	gnats, gnats-db
  listar	?	?	?		?	listar
  nfsnobody	65534	65534	/var/lib/nfs		/sbin/nologin	nfs-utils
  
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index ab9f340..1f1d655 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: 5%{?dist}
+Release: 6%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
@@ -107,6 +107,14 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
 
 %changelog
+* 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)
+- reserve uidgid for systemd-network(192:192) (#1213820)
+- reserve uidgid for systemd-resolve(193:193) (#1213820)
+- mention systemd-jounal-gateway can be dynamic (#1213820) 
+
+
 * 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