diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..920b42b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/noto-emoji-aac7cca.tar.gz
diff --git a/EMPTY b/EMPTY
deleted file mode 100644
index 0519ecb..0000000
--- a/EMPTY
+++ /dev/null
@@ -1 +0,0 @@
- 
\ No newline at end of file
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
new file mode 100644
index 0000000..dde3116
--- /dev/null
+++ b/google-noto-emoji-fonts.spec
@@ -0,0 +1,189 @@
+%global commit0 aac7ccaa4d1dea4543453b96f7d6fc47066a57ff
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
+%global fontname google-noto-emoji
+
+%if (0%{?fedora} > 25)
+%global buildfont 1
+%else
+%global buildfont 0
+%endif
+
+
+Name:           %{fontname}-fonts
+Version:        20200916
+Release:        2%{?dist}
+Summary:        Google “Noto Emoji” Black-and-White emoji font
+
+# In noto-emoji-fonts source
+## noto-emoji code is in ASL 2.0 license
+## Emoji fonts are under OFL license
+### third_party color-emoji code is in BSD license
+### third_party region-flags code is in Public Domain license
+# In nototools source
+## nototools code is in ASL 2.0 license
+### third_party ucd code is in Unicode license
+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
+Source2:        %{fontname}.metainfo.xml
+Source3:        %{fontname}-color.metainfo.xml
+
+Patch0:         noto-emoji-use-system-pngquant.patch
+Patch1:         noto-emoji-build-all-flags.patch
+Patch2:         noto-emoji-use-gm.patch
+
+BuildArch:      noarch
+BuildRequires:  fontpackages-devel
+%if %buildfont
+BuildRequires:  fonttools
+BuildRequires:  python2-fonttools
+BuildRequires:  nototools
+BuildRequires:  python2-nototools
+BuildRequires:  python2-devel
+BuildRequires:  GraphicsMagick
+BuildRequires:  pngquant
+BuildRequires:  zopfli
+BuildRequires:  cairo-devel
+%endif
+
+Requires:       fontpackages-filesystem
+
+Obsoletes:      google-noto-color-emoji-fonts < 20150617
+Provides:       google-noto-color-emoji-fonts = 20150617
+
+%description
+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}
+
+rm -rf third_party/pngquant
+
+%build
+%if %buildfont
+# Work around UTF-8
+export LANG=C.UTF-8
+
+make %{?_smp_mflags} OPT_CFLAGS="$RPM_OPT_FLAGS"
+%endif
+
+%install
+install -m 0755 -d %{buildroot}%{_fontdir}
+
+%if %buildfont
+# Built by us from the supplied pngs:
+install -m 0644 -p NotoColorEmoji.ttf %{buildroot}%{_fontdir}
+%else
+# Pre-built, and included with the source:
+install -m 0644 -p fonts/NotoColorEmoji.ttf %{buildroot}%{_fontdir}
+%endif
+
+# Pre-built, and included with the source:
+install -m 0644 -p fonts/NotoEmoji-Regular.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 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
+* Tue May 25 2021 Peng Wu <pwu@redhat.com> - 20200916-2
+- Rebuild the package
+- Resolves: RHBZ#1897541
+
+* Tue May 25 2021 Peng Wu <pwu@redhat.com> - 20200916-1
+- Update to Unicode 13.1.0 support
+- Resolves: RHBZ#1897541
+
+* Thu Jun 28 2018 Peng Wu <pwu@redhat.com> - 20180508-4
+- Resolves: RHBZ#1591712
+
+* Wed Jun 27 2018 Lumír Balhar <lbalhar@redhat.com> - 20180508-3
+- Disable build of fonts and rather ship pre-built ones
+
+* Wed May 23 2018 Peng Wu <pwu@redhat.com> - 20180508-2
+- Use GraphicsMagick instead of ImageMagick
+
+* 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)
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170928-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Feb  5 2018 Peng Wu <pwu@redhat.com> - 20170928-3
+- Use nototools package to build google-noto-emoji-fonts
+
+* Wed Nov  8 2017 Peter Oliver <rpm@mavit.org.uk> - 20170928-2
+- Prefer zopflipng to optipng, since it should yield smaller files.
+- Use the font we built, rather than the one included with the source.
+
+* 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.
+- Contains the new emoji added in Unicode 10.0.0.
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20170608-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jun 08 2017 Mike FABIAN <mfabian@redhat.com> - 20170608-1
+- Update to upstream snapshot tarball
+
+* Tue May 23 2017 Mike FABIAN <mfabian@redhat.com> - 20170523-1
+- Update to upstream snapshot tarball
+- This fixes the skin tones of the light/medium light male cook emoji,
+  which had been swapped.
+
+* Wed Apr 26 2017 Mike FABIAN <mfabian@redhat.com> - 20170426-1
+- Update to upstream snapshot tarball
+  (fixes the family emoji sequences:
+  kiss: woman, man U+1F469 U+200D U+2764 U+FE0F U+200D U+1F48B U+200D U+1F468
+  couple with heart: woman, man U+1F469 U+200D U+2764 U+FE0F U+200D U+1F468)
+
+* Thu Feb 23 2017 Peng Wu <pwu@redhat.com> - 20170223-1
+- Update to upstream snapshot tarball
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20160406-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri May  6 2016 Peng Wu <pwu@redhat.com> - 20160406-5
+- Avoid to use python setup.py
+
+* Fri Apr 29 2016 Peng Wu <pwu@redhat.com> - 20160406-4
+- Replace google-noto-color-emoji-fonts package
+
+* Mon Apr 25 2016 Peng Wu <pwu@redhat.com> - 20160406-3
+- Add google-noto-emoji.metainfo.xml
+
+* Wed Apr 20 2016 Peng Wu <pwu@redhat.com> - 20160406-2
+- Use system pngquant
+
+* Wed Apr 20 2016 Peng Wu <pwu@redhat.com> - 20160406-1
+- Initial packaging
diff --git a/google-noto-emoji.metainfo.xml b/google-noto-emoji.metainfo.xml
new file mode 100644
index 0000000..beecdc8
--- /dev/null
+++ b/google-noto-emoji.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</id>
+  <metadata_license>CC-BY-3.0</metadata_license>
+  <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>
+</component>
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/noto-emoji-use-gm.patch b/noto-emoji-use-gm.patch
new file mode 100644
index 0000000..e1cf6ee
--- /dev/null
+++ b/noto-emoji-use-gm.patch
@@ -0,0 +1,30 @@
+diff -ru noto-emoji-f8131fc45736000552cd04a8388dc414d666a829.orig/Makefile noto-emoji-f8131fc45736000552cd04a8388dc414d666a829/Makefile
+--- noto-emoji-f8131fc45736000552cd04a8388dc414d666a829.orig/Makefile	2020-06-25 16:02:56.000000000 +0200
++++ noto-emoji-f8131fc45736000552cd04a8388dc414d666a829/Makefile	2020-07-21 11:12:06.948389580 +0200
+@@ -22,7 +22,8 @@
+ PYTHON = python3
+ PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
+ BODY_DIMENSIONS = 136x128
+-IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
++#IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
++IMOPS = -size 136x128 -background none -gravity center -extent 136x128 -compose copy
+ 
+ ZOPFLIPNG = zopflipng
+ TTX = ttx
+@@ -163,13 +164,13 @@
+ # imagemagick packaged with ubuntu trusty (6.7.7-10) by using -composite.
+ 
+ $(EMOJI_DIR)/%.png: $(EMOJI_SRC_DIR)/%.png | $(EMOJI_DIR)
+-	@convert $(IMOPS) "$<" -composite "PNG32:$@"
++	@gm convert $(IMOPS) "$<" "PNG32:$@"
+ 
+ $(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag | $(FLAGS_DIR)
+ 	@./waveflag $(FLAGS_DIR)/ "$<"
+ 
+ $(RESIZED_FLAGS_DIR)/%.png: $(FLAGS_DIR)/%.png | $(RESIZED_FLAGS_DIR)
+-	@convert $(IMOPS) "$<" -composite "PNG32:$@"
++	@gm convert $(IMOPS) "$<" "PNG32:$@"
+ 
+ flag-symlinks: $(RESIZED_FLAG_FILES) | $(RENAMED_FLAGS_DIR)
+ 	@$(subst ^, ,                                  \
+
diff --git a/noto-emoji-use-system-pngquant.patch b/noto-emoji-use-system-pngquant.patch
new file mode 100644
index 0000000..f3dd7ff
--- /dev/null
+++ b/noto-emoji-use-system-pngquant.patch
@@ -0,0 +1,29 @@
+diff -ru noto-emoji-d5e261484286d33a1fe8a02676f5907ecc02106f.orig/Makefile noto-emoji-d5e261484286d33a1fe8a02676f5907ecc02106f/Makefile
+--- noto-emoji-d5e261484286d33a1fe8a02676f5907ecc02106f.orig/Makefile	2020-07-23 18:53:36.935321925 +0200
++++ noto-emoji-d5e261484286d33a1fe8a02676f5907ecc02106f/Makefile	2020-07-23 19:05:20.380141144 +0200
+@@ -15,10 +15,10 @@
+ EMOJI = NotoColorEmoji
+ font: $(EMOJI).ttf
+ 
+-CFLAGS = -std=c99 -Wall -Wextra `pkg-config --cflags --libs cairo`
++CFLAGS = $(OPT_CFLAGS) -Wextra `pkg-config --cflags --libs cairo`
+ LDFLAGS = -lm `pkg-config --libs cairo`
+ 
+-PNGQUANT = pngquant
++PNGQUANT = /usr/bin/pngquant
+ PYTHON = python3
+ PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
+ BODY_DIMENSIONS = 136x128
+@@ -87,9 +87,9 @@
+   endif
+ endif
+ 
+-ifndef VIRTUAL_ENV
+-  MISSING_VENV = fail
+-endif
++#ifndef VIRTUAL_ENV
++#  MISSING_VENV = fail
++#endif
+ 
+ ifeq (, $(shell which $(VS_ADDER)))
+   MISSING_PY_TOOLS = fail
diff --git a/sources b/sources
new file mode 100644
index 0000000..9bc198d
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (noto-emoji-aac7cca.tar.gz) = d497c4ecaf299ade23b1f6a3bc6e98d7dbbb619e51f067496d4a4dbf71693c96de26263af595c0aae86c63dcea8be190718f5477af645d4338989f25cc3ab848