diff --git a/.gitignore b/.gitignore
index 2b68a8d..83af391 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,6 @@
 /unifont-12.0.01.tar.gz
 /unifont-12.1.02.tar.gz
 /unifont-13.0.05.tar.gz
+/unifont-14.0.01.tar.gz
+/unifont-15.0.01.tar.gz
+/unifont-16.0.01.tar.gz
diff --git a/changelog b/changelog
index 396d181..f3e3362 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 13.0.05-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Mar  1 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 13.0.05-2
+- Require bdftopcf instead of xorg-x11-font-utils
+  (https://fedoraproject.org/wiki/Changes/XorgUtilityDeaggregation)
+
 * Wed Feb  3 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 13.0.05-1
 - Latest upstream version
 
diff --git a/sources b/sources
index e8f9228..49153fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (unifont-13.0.05.tar.gz) = d15f4cd8224ecf0dc2d453f0c3f7dbabf5b9e6ce8f713e1eb94bf5d1ad1b22a0e07861919546ec29cdb5b824343208da80d368955775b4c0e20057345407d0f5
+SHA512 (unifont-16.0.01.tar.gz) = cfbb6598fc7fda7bbe1d061d3d35e3433df033bece0468fe469338ecac82fddd3fd9fd35f4693147284f28b02011939cad3c2570d878677c472227909f65af27
diff --git a/unifont.spec b/unifont.spec
index fb4f807..50acad7 100644
--- a/unifont.spec
+++ b/unifont.spec
@@ -1,7 +1,7 @@
 Name:            unifont
-Version:         13.0.05
+Version:         16.0.01
 Release:         %autorelease
-License:         GPLv2+ and GFDL
+License:         GPL-2.0-or-later AND OFL-1.1 AND GFDL-1.3-or-later
 Url:             https://savannah.gnu.org/projects/unifont
 Summary:         Tools and glyph descriptions in a very simple text format
 
@@ -11,15 +11,18 @@ Source1:         unifont.metainfo.xml
 BuildRequires:   make
 BuildRequires:   gcc
 BuildRequires:   perl-generators
-BuildRequires:   xorg-x11-font-utils
+BuildRequires:   perl-GD
+BuildRequires:   bdftopcf
+BuildRequires:   bdf2psf
 BuildRequires:   fontforge
 BuildRequires:   fontpackages-devel
 BuildRequires:   texinfo
+BuildRequires:   ImageMagick
 
 %description
-A font with a glyph for every visible Unicode Basic Multilingual Plane
-code point and more, with supporting utilities to modify the
-font. This package contains tools and glyph descriptions.
+A font with a glyph for every visible Unicode Basic Multilingual Plane code
+point and more, with supporting utilities to modify the font. This package
+contains tools and glyph descriptions.
 
 %package fonts
 BuildArch: noarch
@@ -28,19 +31,29 @@ Summary: Unicode font with a glyph for every visible BMP code point
 Requires:        fontpackages-filesystem
 
 %description fonts
-A fixed-width Unicode font with a glyph for every visible Unicode 7.0
-Basic Multilingual Plane code point (over 55,000 glyphs) and some
-glyphs beyond BMP.
+A fixed-width Unicode font with a glyph for every visible Unicode 7.0 Basic
+Multilingual Plane code point (over 55,000 glyphs) and some glyphs beyond BMP.
 
-This font strives for very wide coverage rather than beauty, so use it
-only as fallback or for special purposes.
+This font strives for very wide coverage rather than beauty, so use it only as
+fallback or for special purposes.
+
+This package contains unicode fonts in OTF format.
+
+%package ttf-fonts
+BuildArch: noarch
+Summary: Unicode font with a glyph for every visible BMP code point
+Requires: (unifont-fonts = %{version}-%{release} if unifont-fonts)
+
+%description ttf-fonts
+This package contains unicode fonts in TTF format.
+It is provided for compatibility, and unifont-fonts should be used instead.
 
 %package viewer
 BuildArch: noarch
 Summary: Graphical viewer for unifont
 
 %description viewer
-A graphical viewer for unifont.
+A graphical viewer for unifont source character definitions.
 
 %prep
 %setup -q -n unifont-%{version}
@@ -49,16 +62,20 @@ sed -i 's/^install: .*/install:/' Makefile
 sed -i 's/install -s/install/' src/Makefile
 
 %build
+%make_build CFLAGS='%{optflags}'
 # Makefile is broken with parallel builds
-make CFLAGS='%{optflags}'
+make -C font all ttf upperttf
 make -C doc unifont.info
 
 %install
-%make_install USRDIR=/usr COMPRESS=0 TTFDEST='$(DESTDIR)/usr/share/fonts/unifont'
+%make_install USRDIR=/usr COMPRESS=0 \
+  OTFDEST='$(DESTDIR)/usr/share/fonts/unifont'
+install -Dm0644 font/compiled/unifont-%{version}.ttf %{buildroot}%{_fontdir}/unifont.ttf
+install -Dm0644 font/compiled/unifont_upper-%{version}.ttf %{buildroot}%{_fontdir}/unifont_upper.ttf
+
 find %{buildroot}/usr/share/unifont/ -type f \! -name %{name}.hex -delete
 rm -rv %{buildroot}/usr/share/fonts/X11
 rm -v %{buildroot}%{_fontdir}/*sample*
-rm -v %{buildroot}%{_fontdir}/unifont_*csur*.ttf
 install -Dm0644 doc/unifont.info %{buildroot}%{_infodir}/unifont.info
 install -Dm0644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/unifont.metainfo.xml
 # Remove APL font for now
@@ -74,7 +91,11 @@ rm %{buildroot}/usr/share/consolefonts/Unifont-APL8x16.psf.gz
 %{_infodir}/unifont.*
 %exclude %{_bindir}/unifont-viewer
 
-%_font_pkg *.ttf
+%_font_pkg *.otf
+%{_datadir}/appdata/
+%license COPYING
+
+%_font_pkg -n ttf *.ttf
 %{_datadir}/appdata/
 %license COPYING