diff --git a/.gitignore b/.gitignore
index a2b0b9a..daff5ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /noto-emoji-411334c.tar.gz
 /results_google-noto-emoji-fonts/
 /noto-emoji-153e1d4.tar.gz
+/noto-emoji-352632e.tar.gz
diff --git a/google-noto-emoji-fonts.spec b/google-noto-emoji-fonts.spec
index b9e2662..d0cc457 100644
--- a/google-noto-emoji-fonts.spec
+++ b/google-noto-emoji-fonts.spec
@@ -1,14 +1,11 @@
-%global commit0 153e1d4c026c124fbac6ee93e559b5df375f24f5
+%global commit0 352632eb1935fd2b732f6f3ca0a24e9754c3eccf
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
-%global commit1 0c99dfff2a824c6f7210ff700c56b2c3d51e64cd
-%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
-
 %global fontname google-noto-emoji
 
 
 Name:           %{fontname}-fonts
-Version:        20180307
+Version:        20180508
 Release:        1%{?dist}
 Summary:        Google “Noto Emoji” Black-and-White emoji font
 
@@ -27,6 +24,7 @@ Source2:        %{fontname}.metainfo.xml
 Source3:        %{fontname}-color.metainfo.xml
 
 Patch0:         noto-emoji-use-system-pngquant.patch
+Patch1:         noto-emoji-build-all-flags.patch
 
 BuildArch:      noarch
 BuildRequires:  gcc
@@ -94,6 +92,10 @@ install -m 0644 -p %{SOURCE3} %{buildroot}%{_datadir}/appdata
 
 
 %changelog
+* Tue May 08 2018 Mike FABIAN <mfabian@redhat.com> - 20180508-1
+- Update to upstream snapshot tarball (color emoji font version 2.011)
+- Add patch to build all country flags (Resolves: rhbz#1574195)
+
 * Wed Mar 07 2018 Mike FABIAN <mfabian@redhat.com> - 20180307-1
 - Update to upstream snapshot tarball (color emoji font version 2.004)
 
diff --git a/noto-emoji-build-all-flags.patch b/noto-emoji-build-all-flags.patch
new file mode 100644
index 0000000..564b08a
--- /dev/null
+++ b/noto-emoji-build-all-flags.patch
@@ -0,0 +1,11 @@
+--- old/Makefile	2018-05-03 20:32:14.000000000 +0200
++++ new/Makefile	2018-05-08 11:48:20.811073447 +0200
+@@ -78,7 +78,7 @@
+ 
+ ALL_FLAGS = $(basename $(notdir $(wildcard $(FLAGS_SRC_DIR)/*.png)))
+ 
+-FLAGS = $(SELECTED_FLAGS)
++FLAGS = $(ALL_FLAGS)
+ 
+ FLAG_NAMES = $(FLAGS:%=%.png)
+ FLAG_FILES = $(addprefix $(FLAGS_DIR)/, $(FLAG_NAMES))
diff --git a/sources b/sources
index 08309cb..6cbb0a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (noto-emoji-153e1d4.tar.gz) = b2da342ccee73e72aac41a59afe0a726acf66cd1314f9582eb890b80ab646a340db14acbf4bd3146de9f30b50f84f38f76ca56369b7ef4b70b3e901e31b72355
+SHA512 (noto-emoji-352632e.tar.gz) = 9e621e0183ab9a826edc22f59964d285ef0f0191eb10a01c745c759904d02d084b78d510d394d5042d80314fae8f7a94ac5e4455cfcd1d902876551e31543036