diff --git a/.gitignore b/.gitignore
index e69de29..dd46d16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/mkfontscale-1.2.1.tar.bz2
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..87a5bae
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# mkfontscale
+
+The mkfontscale package
diff --git a/mkfontscale-examine-all-encodings.patch b/mkfontscale-examine-all-encodings.patch
new file mode 100644
index 0000000..217f0a4
--- /dev/null
+++ b/mkfontscale-examine-all-encodings.patch
@@ -0,0 +1,13 @@
+diff --git a/mkfontscale.c b/mkfontscale.c
+index a67f283..96e19a3 100644
+--- a/mkfontscale.c
++++ b/mkfontscale.c
+@@ -326,7 +326,7 @@ getName(FT_Face face, int nid)
+     unsigned int i;
+
+     if(getNameHelper(face, nid,
+-                     TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) ||
++                     TT_PLATFORM_MICROSOFT, -1, &name) ||
+        getNameHelper(face, nid,
+                      TT_PLATFORM_APPLE_UNICODE, -1, &name)) {
+         string = malloc(name.string_len / 2 + 1);
diff --git a/mkfontscale.spec b/mkfontscale.spec
new file mode 100644
index 0000000..a9d359f
--- /dev/null
+++ b/mkfontscale.spec
@@ -0,0 +1,50 @@
+Name:       mkfontscale
+Version:    1.2.1
+Release:    1%{?dist}
+Summary:    Tool to generate legacy X11 font system index files
+
+License:    MIT
+URL:        https://www.x.org
+Source0:    https://www.x.org/pub/individual/app/%{name}-%{version}.tar.bz2
+
+Patch0:     mkfontscale-examine-all-encodings.patch
+
+BuildRequires:  gcc make libtool
+BuildRequires:  pkgconfig(fontenc)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xorg-macros) >= 1.8
+BuildRequires:  zlib-devel
+
+Conflicts:  xorg-x11-font-utils <= 7.5-50
+
+# Used to be a separate upstream repo in xorg-x11-font-utils, now it's part
+# of mkfontscale. Keep the Provides alive though.
+Provides:   mkfontdir = %{version}
+
+%description
+mkfontscale creates the fonts.scale and fonts.dir index files used by the
+legacy X11 font system.  It now includes the mkfontdir script previously
+distributed separately for compatibility with older X11 versions.
+
+%prep
+%autosetup
+
+%build
+%configure --disable-silent-rules
+%make_build
+
+%install
+%make_install
+
+%files
+%license COPYING
+%{_bindir}/mkfontdir
+%{_bindir}/mkfontscale
+%{_mandir}/man1/mkfontdir.1*
+%{_mandir}/man1/mkfontscale.1*
+
+%changelog
+* Thu Feb 25 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.2.1-1
+- Split mkfontscale/mkfontdir out from xorg-x11-font-utils into its own
+  package (#1932734)
diff --git a/sources b/sources
new file mode 100644
index 0000000..83a6d1d
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (mkfontscale-1.2.1.tar.bz2) = 4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c