diff --git a/.gitignore b/.gitignore
index a7d8fb9..0f2b632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 /nototools-d8f3d16.tar.gz
 /noto-emoji-a4ddd5b.tar.gz
 /nototools-feacefe.tar.gz
+/nototools-0c99dff.tar.gz
+/noto-emoji-411334c.tar.gz
diff --git a/google-noto-emoji-color.metainfo.xml b/google-noto-emoji-color.metainfo.xml
new file mode 100644
index 0000000..4316bcd
--- /dev/null
+++ b/google-noto-emoji-color.metainfo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2016 Peng Wu <pwu AT redhat DOT com> -->
+<component type="font">
+  <id>google-noto-emoji-color</id>
+  <metadata_license>CC-BY-3.0</metadata_license>
+  <name>Noto Color Emoji</name>
+  <summary>Google Noto Color Emoji Font</summary>
+  <url type="homepage">https://github.com/googlei18n/noto-emoji</url>
+  <update_contact><!-- upstream-contact_at_email.com --></update_contact>
+  <extends>google-noto</extends>
+</component>
diff --git a/google-noto-emoji-fonts.spec b/google-noto-emoji-fonts.spec
index c33f7c4..2d9be14 100644
--- a/google-noto-emoji-fonts.spec
+++ b/google-noto-emoji-fonts.spec
@@ -1,16 +1,16 @@
-%global commit0 a4ddd5b44fe2b78643a05ab396d127823db645f7
+%global commit0 411334c8e630acf858569602cbf5c19deba00878
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
-%global commit1 feacefe1957dbb2f8bbe874ac9b01d6cd7d29108
+%global commit1 0c99dfff2a824c6f7210ff700c56b2c3d51e64cd
 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
 
 %global fontname google-noto-emoji
 
 
-Name:           google-noto-emoji-fonts
-Version:        20170827
+Name:           %{fontname}-fonts
+Version:        20170928
 Release:        1%{?dist}
-Summary:        Google Noto Emoji Fonts
+Summary:        Google “Noto Emoji” Black-and-White emoji font
 
 # In noto-emoji-fonts source
 ## noto-emoji code is in ASL 2.0 license
@@ -24,7 +24,8 @@ License:        OFL and ASL 2.0
 URL:            https://github.com/googlei18n/noto-emoji
 Source0:        https://github.com/googlei18n/noto-emoji/archive/%{commit0}.tar.gz#/noto-emoji-%{shortcommit0}.tar.gz
 Source1:        https://github.com/googlei18n/nototools/archive/%{commit1}.tar.gz#/nototools-%{shortcommit1}.tar.gz
-Source2:        google-noto-emoji.metainfo.xml
+Source2:        %{fontname}.metainfo.xml
+Source3:        %{fontname}-color.metainfo.xml
 
 Patch0:         noto-emoji-use-system-pngquant.patch
 
@@ -44,8 +45,16 @@ Obsoletes:      google-noto-color-emoji-fonts < 20150617
 Provides:       google-noto-color-emoji-fonts = 20150617
 
 %description
-Color and Black-and-White Noto emoji fonts, and tools for working with them.
+This package provides the Google “Noto Emoji” Black-and-White emoji font.
 
+%package -n     %{fontname}-color-fonts
+Summary:        Google “Noto Color Emoji” colored emoji font
+Requires:       fontpackages-filesystem
+Obsoletes:      google-noto-color-emoji-fonts < 20150617
+Provides:       google-noto-color-emoji-fonts = 20150617
+
+%description -n %{fontname}-color-fonts
+This package provides the Google “Noto Color Emoji” colored emoji font.
 
 %prep
 %autosetup -n noto-emoji-%{commit0}
@@ -72,15 +81,24 @@ install -m 0644 -p fonts/*.ttf %{buildroot}%{_fontdir}
 
 mkdir -p %{buildroot}%{_datadir}/appdata
 install -m 0644 -p %{SOURCE2} %{buildroot}%{_datadir}/appdata
+install -m 0644 -p %{SOURCE3} %{buildroot}%{_datadir}/appdata
 
-
-%_font_pkg *.ttf
+%_font_pkg NotoEmoji-Regular.ttf
 %license LICENSE
 %doc AUTHORS CONTRIBUTING.md CONTRIBUTORS README.md
 %{_datadir}/appdata/google-noto-emoji.metainfo.xml
 
+%_font_pkg -n color NotoColorEmoji.ttf
+%license LICENSE
+%doc AUTHORS CONTRIBUTING.md CONTRIBUTORS README.md
+%{_datadir}/appdata/google-noto-emoji-color.metainfo.xml
+
 
 %changelog
+* Thu Sep 28 2017 Mike FABIAN <mfabian@redhat.com> - 20170828-1
+- Update to upstream snapshot tarball
+- split black-and-white and color fonts into different sub-packages.
+
 * Mon Aug 28 2017 Mike FABIAN <mfabian@redhat.com> - 20170827-1
 - Update to upstream snapshot tarball
 - Update color emoji font to version 2.001, new design.
diff --git a/google-noto-emoji.metainfo.xml b/google-noto-emoji.metainfo.xml
index d32c28b..beecdc8 100644
--- a/google-noto-emoji.metainfo.xml
+++ b/google-noto-emoji.metainfo.xml
@@ -3,8 +3,8 @@
 <component type="font">
   <id>google-noto-emoji</id>
   <metadata_license>CC-BY-3.0</metadata_license>
-  <name>Emoji</name>
-  <summary>Google Noto Emoji Fonts</summary>
+  <name>Noto Emoji</name>
+  <summary>Google Noto Emoji Font</summary>
   <url type="homepage">https://github.com/googlei18n/noto-emoji</url>
   <update_contact><!-- upstream-contact_at_email.com --></update_contact>
   <extends>google-noto</extends>
diff --git a/sources b/sources
index 6f86f33..57b924c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (noto-emoji-a4ddd5b.tar.gz) = 40510df57d9472ec3d7f2e57287061a35eaf5f7f1e303303c8bdf2395c52e78315623386d350de4b986f1562e5726f575867dccb8f41c1f4c4a8772313bea564
-SHA512 (nototools-feacefe.tar.gz) = 3bfc91f5ad3d002d52d7c8ad2693d842d08039be510c9d89df62c726279a849bf07df76fd0d660d6b47261683a80823f83a67733d14b4765d3a2ac2e4287f372
+SHA512 (nototools-0c99dff.tar.gz) = 857517142f95eb48029849e56c5f50ebf9827afed297c873fbab41500ea13dda98ffaf916f5e61a2ab764202c6724880d0f67b214707614918ddee243acea66c
+SHA512 (noto-emoji-411334c.tar.gz) = 2b21bf329766e0e4dd1a0817000af6de82e3485da74f1899c6b7d98bad69a8b573aef4437a4837fa25a98235df3d11ebae2a7fc2c7c03ce88b56f572ef310f4d