diff --git a/corosync.spec b/corosync.spec
index ee92e8e..5b1774e 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -21,12 +21,14 @@
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
 Version: 2.3.6
-Release: 1%{?gitver}%{?dist}
+Release: 2%{?gitver}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://corosync.github.io/corosync/
 Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz
 
+Patch0: Config-Flag-config-uidgid-entries.patch
+
 %if 0%{?rhel}
 ExclusiveArch: i686 x86_64
 %endif
@@ -74,6 +76,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
 %setup -q -n %{name}-%{version}%{?gittarver}
+%patch0 -p1 -b .flag-config-uidgid-entries
 
 %build
 %if %{with runautogen}
@@ -337,6 +340,10 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/quorum_overview.8*
 
 %changelog
+* Thu Aug 04 2016 Jan Friesse <jfriesse@redhat.com> 2.3.6-2
+- Config: Flag config uidgid entries
+- merge upstream commit f837f95dfe96d60f2367e900efd4def7a07b2a89
+
 * Thu Jun 16 2016 Jan Friesse <jfriesse@redhat.com> - 2.3.6-1
 - New upstream release