diff --git a/font-xorg-bitstream75dpi.yaml b/font-xorg-bitstream75dpi.yaml
new file mode 100644
index 00000000000..8af431cd59e
--- /dev/null
+++ b/font-xorg-bitstream75dpi.yaml
@@ -0,0 +1,77 @@
+package:
+  name: font-xorg-bitstream75dpi
+  version: 1.0.4
+  epoch: 0
+  description: X.Org Bitstream 75 dpi bitmap fonts
+  copyright:
+    - license: MIT
+  dependencies:
+    provides:
+      - fonts-xorg-fontbitstream75dpi=${{package.full-version}}
+    runtime:
+      - font-xorg-dirs
+
+environment:
+  contents:
+    packages:
+      - autoconf
+      - automake
+      - bdftopcf
+      - build-base
+      - busybox
+      - font-util
+      - font-util-dev
+      - fontconfig
+      - fontforge
+      - mkfontscale
+      - pkgconf-dev
+      - ttfautohint
+
+pipeline:
+  - uses: git-checkout
+    with:
+      repository: https://gitlab.freedesktop.org/xorg/font/bitstream-75dpi
+      tag: font-bitstream-75dpi-${{package.version}}
+      expected-commit: 6c4a1c79b3b73c63ee7f9fc52318df3c356f7eb3
+
+  - uses: autoconf/configure
+
+  - uses: autoconf/make
+
+  - uses: autoconf/make-install
+
+  - name: Strip font indices since it conflicts with other font-xorg packages
+    runs: |
+      find "${{targets.destdir}}/usr/share/fonts/X11" \
+           -type f \( -name 'fonts.dir'   \
+                    -o -name 'fonts.scale' \
+                    -o -name 'fonts.alias' \) -delete
+
+update:
+  enabled: true
+  git:
+    strip-prefix: font-bitstream-75dpi-
+  ignore-regex-patterns:
+    - ^XORG-.*
+    - ^CYGWIN-.*
+    - ^lg3d-.*
+    - ^XACE-.*
+    - ^XEVIE-.*
+    - ^DAMAGE-.*
+    - ^COMPOSITE-.*
+    - ^XFIXES-.*
+    - ^sco_port_update-.*
+    - ^MODULAR_COPY$
+    - ^xf86-.*
+    - ^rel-.*
+    - ^IPv6-.*
+    - ^XPRINT.*
+    - ^before_.*
+    - ^xo-.*
+  schedule:
+    period: monthly
+    reason: This project doesn't do releases frequently
+
+test:
+  pipeline:
+    - uses: test/fonts
diff --git a/font-xorg-cronyxcyrillic.yaml b/font-xorg-cronyxcyrillic.yaml
new file mode 100644
index 00000000000..01474214b63
--- /dev/null
+++ b/font-xorg-cronyxcyrillic.yaml
@@ -0,0 +1,77 @@
+package:
+  name: font-xorg-cronyxcyrillic
+  version: 1.0.4
+  epoch: 0
+  description: X.Org Cronyx Cyrillic bitmap fonts
+  copyright:
+    - license: MIT
+  dependencies:
+    provides:
+      - fonts-xorg-fontcronyxcyrillic=${{package.full-version}}
+    runtime:
+      - font-xorg-dirs
+
+environment:
+  contents:
+    packages:
+      - autoconf
+      - automake
+      - bdftopcf
+      - build-base
+      - busybox
+      - font-util
+      - font-util-dev
+      - fontconfig
+      - fontforge
+      - mkfontscale
+      - pkgconf-dev
+      - ttfautohint
+
+pipeline:
+  - uses: git-checkout
+    with:
+      repository: https://gitlab.freedesktop.org/xorg/font/cronyx-cyrillic
+      tag: font-cronyx-cyrillic-${{package.version}}
+      expected-commit: b767723353f2691f29a7aa5cd133be202e4b8878
+
+  - uses: autoconf/configure
+
+  - uses: autoconf/make
+
+  - uses: autoconf/make-install
+
+  - name: Strip font indices since it conflicts with other font-xorg packages
+    runs: |
+      find "${{targets.destdir}}/usr/share/fonts/X11" \
+           -type f \( -name 'fonts.dir'   \
+                    -o -name 'fonts.scale' \
+                    -o -name 'fonts.alias' \) -delete
+
+update:
+  enabled: true
+  git:
+    strip-prefix: font-cronyx-cyrillic-
+  ignore-regex-patterns:
+    - ^XORG-.*
+    - ^CYGWIN-.*
+    - ^lg3d-.*
+    - ^XACE-.*
+    - ^XEVIE-.*
+    - ^DAMAGE-.*
+    - ^COMPOSITE-.*
+    - ^XFIXES-.*
+    - ^sco_port_update-.*
+    - ^MODULAR_COPY$
+    - ^xf86-.*
+    - ^rel-.*
+    - ^IPv6-.*
+    - ^XPRINT.*
+    - ^before_.*
+    - ^xo-.*
+  schedule:
+    period: monthly
+    reason: This project doesn't do releases frequently
+
+test:
+  pipeline:
+    - uses: test/fonts
diff --git a/font-xorg-jismisc.yaml b/font-xorg-jismisc.yaml
new file mode 100644
index 00000000000..2b74070b73d
--- /dev/null
+++ b/font-xorg-jismisc.yaml
@@ -0,0 +1,77 @@
+package:
+  name: font-xorg-jismisc
+  version: 1.0.4
+  epoch: 0
+  description: X.Org JIS bitmap fonts
+  copyright:
+    - license: MIT
+  dependencies:
+    provides:
+      - fonts-xorg-fontjismisc=${{package.full-version}}
+    runtime:
+      - font-xorg-dirs
+
+environment:
+  contents:
+    packages:
+      - autoconf
+      - automake
+      - bdftopcf
+      - build-base
+      - busybox
+      - font-util
+      - font-util-dev
+      - fontconfig
+      - fontforge
+      - mkfontscale
+      - pkgconf-dev
+      - ttfautohint
+
+pipeline:
+  - uses: git-checkout
+    with:
+      repository: https://gitlab.freedesktop.org/xorg/font/jis-misc
+      tag: font-jis-misc-${{package.version}}
+      expected-commit: 8da1fbf9d2f0b101ff44f044723d9cb09e5fc941
+
+  - uses: autoconf/configure
+
+  - uses: autoconf/make
+
+  - uses: autoconf/make-install
+
+  - name: Strip font indices since it conflicts with other font-xorg packages
+    runs: |
+      find "${{targets.destdir}}/usr/share/fonts/X11" \
+           -type f \( -name 'fonts.dir'   \
+                    -o -name 'fonts.scale' \
+                    -o -name 'fonts.alias' \) -delete
+
+update:
+  enabled: true
+  git:
+    strip-prefix: font-jis-misc-
+  ignore-regex-patterns:
+    - ^XORG-.*
+    - ^CYGWIN-.*
+    - ^lg3d-.*
+    - ^XACE-.*
+    - ^XEVIE-.*
+    - ^DAMAGE-.*
+    - ^COMPOSITE-.*
+    - ^XFIXES-.*
+    - ^sco_port_update-.*
+    - ^MODULAR_COPY$
+    - ^xf86-.*
+    - ^rel-.*
+    - ^IPv6-.*
+    - ^XPRINT.*
+    - ^before_.*
+    - ^xo-.*
+  schedule:
+    period: monthly
+    reason: This project doesn't do releases frequently
+
+test:
+  pipeline:
+    - uses: test/fonts
diff --git a/font-xorg-micromisc.yaml b/font-xorg-micromisc.yaml
new file mode 100644
index 00000000000..8599a26be26
--- /dev/null
+++ b/font-xorg-micromisc.yaml
@@ -0,0 +1,77 @@
+package:
+  name: font-xorg-micromisc
+  version: 1.0.4
+  epoch: 0
+  description: X.Org Micro Misc bitmap fonts
+  copyright:
+    - license: MIT
+  dependencies:
+    provides:
+      - fonts-xorg-fontmicromisc=${{package.full-version}}
+    runtime:
+      - font-xorg-dirs
+
+environment:
+  contents:
+    packages:
+      - autoconf
+      - automake
+      - bdftopcf
+      - build-base
+      - busybox
+      - font-util
+      - font-util-dev
+      - fontconfig
+      - fontforge
+      - mkfontscale
+      - pkgconf-dev
+      - ttfautohint
+
+pipeline:
+  - uses: git-checkout
+    with:
+      repository: https://gitlab.freedesktop.org/xorg/font/micro-misc
+      tag: font-micro-misc-${{package.version}}
+      expected-commit: 0cbba4838a17c19a6aa11958e805fe539459aab6
+
+  - uses: autoconf/configure
+
+  - uses: autoconf/make
+
+  - uses: autoconf/make-install
+
+  - name: Strip font indices since it conflicts with other font-xorg packages
+    runs: |
+      find "${{targets.destdir}}/usr/share/fonts/X11" \
+           -type f \( -name 'fonts.dir'   \
+                    -o -name 'fonts.scale' \
+                    -o -name 'fonts.alias' \) -delete
+
+update:
+  enabled: true
+  git:
+    strip-prefix: font-micro-misc-
+  ignore-regex-patterns:
+    - ^XORG-.*
+    - ^CYGWIN-.*
+    - ^lg3d-.*
+    - ^XACE-.*
+    - ^XEVIE-.*
+    - ^DAMAGE-.*
+    - ^COMPOSITE-.*
+    - ^XFIXES-.*
+    - ^sco_port_update-.*
+    - ^MODULAR_COPY$
+    - ^xf86-.*
+    - ^rel-.*
+    - ^IPv6-.*
+    - ^XPRINT.*
+    - ^before_.*
+    - ^xo-.*
+  schedule:
+    period: monthly
+    reason: This project doesn't do releases frequently
+
+test:
+  pipeline:
+    - uses: test/fonts
diff --git a/font-xorg-miscethiopic.yaml b/font-xorg-miscethiopic.yaml
new file mode 100644
index 00000000000..b9a4d7c65d1
--- /dev/null
+++ b/font-xorg-miscethiopic.yaml
@@ -0,0 +1,77 @@
+package:
+  name: font-xorg-miscethiopic
+  version: 1.0.5
+  epoch: 0
+  description: X.Org Misc Ethiopian bitmap fonts
+  copyright:
+    - license: MIT
+  dependencies:
+    provides:
+      - fonts-xorg-fontmiscethiopic=${{package.full-version}}
+    runtime:
+      - font-xorg-dirs
+
+environment:
+  contents:
+    packages:
+      - autoconf
+      - automake
+      - bdftopcf
+      - build-base
+      - busybox
+      - font-util
+      - font-util-dev
+      - fontconfig
+      - fontforge
+      - mkfontscale
+      - pkgconf-dev
+      - ttfautohint
+
+pipeline:
+  - uses: git-checkout
+    with:
+      repository: https://gitlab.freedesktop.org/xorg/font/misc-ethiopic
+      tag: font-misc-ethiopic-${{package.version}}
+      expected-commit: 65a2192f07a2243a6d84a891c9ab6e8a16e6bfa9
+
+  - uses: autoconf/configure
+
+  - uses: autoconf/make
+
+  - uses: autoconf/make-install
+
+  - name: Strip font indices since it conflicts with other font-xorg packages
+    runs: |
+      find "${{targets.destdir}}/usr/share/fonts/X11" \
+           -type f \( -name 'fonts.dir'   \
+                    -o -name 'fonts.scale' \
+                    -o -name 'fonts.alias' \) -delete
+
+update:
+  enabled: true
+  git:
+    strip-prefix: font-misc-ethiopic-
+  ignore-regex-patterns:
+    - ^XORG-.*
+    - ^CYGWIN-.*
+    - ^lg3d-.*
+    - ^XACE-.*
+    - ^XEVIE-.*
+    - ^DAMAGE-.*
+    - ^COMPOSITE-.*
+    - ^XFIXES-.*
+    - ^sco_port_update-.*
+    - ^MODULAR_COPY$
+    - ^xf86-.*
+    - ^rel-.*
+    - ^IPv6-.*
+    - ^XPRINT.*
+    - ^before_.*
+    - ^xo-.*
+  schedule:
+    period: monthly
+    reason: This project doesn't do releases frequently
+
+test:
+  pipeline:
+    - uses: test/fonts
diff --git a/font-xorg-miscmeltho.yaml b/font-xorg-miscmeltho.yaml
new file mode 100644
index 00000000000..2455846dacf
--- /dev/null
+++ b/font-xorg-miscmeltho.yaml
@@ -0,0 +1,77 @@
+package:
+  name: font-xorg-miscmeltho
+  version: 1.0.4
+  epoch: 0
+  description: X.Org Misc Meltho bitmap fonts
+  copyright:
+    - license: MIT
+  dependencies:
+    provides:
+      - fonts-xorg-fontmiscmeltho=${{package.full-version}}
+    runtime:
+      - font-xorg-dirs
+
+environment:
+  contents:
+    packages:
+      - autoconf
+      - automake
+      - bdftopcf
+      - build-base
+      - busybox
+      - font-util
+      - font-util-dev
+      - fontconfig
+      - fontforge
+      - mkfontscale
+      - pkgconf-dev
+      - ttfautohint
+
+pipeline:
+  - uses: git-checkout
+    with:
+      repository: https://gitlab.freedesktop.org/xorg/font/misc-meltho
+      tag: font-misc-meltho-${{package.version}}
+      expected-commit: 2de3debfff98f44b271d1319d2e0aaf63251234f
+
+  - uses: autoconf/configure
+
+  - uses: autoconf/make
+
+  - uses: autoconf/make-install
+
+  - name: Strip font indices since it conflicts with other font-xorg packages
+    runs: |
+      find "${{targets.destdir}}/usr/share/fonts/X11" \
+           -type f \( -name 'fonts.dir'   \
+                    -o -name 'fonts.scale' \
+                    -o -name 'fonts.alias' \) -delete
+
+update:
+  enabled: true
+  git:
+    strip-prefix: font-misc-meltho-
+  ignore-regex-patterns:
+    - ^XORG-.*
+    - ^CYGWIN-.*
+    - ^lg3d-.*
+    - ^XACE-.*
+    - ^XEVIE-.*
+    - ^DAMAGE-.*
+    - ^COMPOSITE-.*
+    - ^XFIXES-.*
+    - ^sco_port_update-.*
+    - ^MODULAR_COPY$
+    - ^xf86-.*
+    - ^rel-.*
+    - ^IPv6-.*
+    - ^XPRINT.*
+    - ^before_.*
+    - ^xo-.*
+  schedule:
+    period: monthly
+    reason: This project doesn't do releases frequently
+
+test:
+  pipeline:
+    - uses: test/fonts
diff --git a/font-xorg-miscmisc.yaml b/font-xorg-miscmisc.yaml
new file mode 100644
index 00000000000..c1da95b08d9
--- /dev/null
+++ b/font-xorg-miscmisc.yaml
@@ -0,0 +1,77 @@
+package:
+  name: font-xorg-miscmisc
+  version: 1.1.3
+  epoch: 0
+  description: X.Org Misc Misc bitmap fonts
+  copyright:
+    - license: MIT
+  dependencies:
+    provides:
+      - fonts-xorg-fontmiscmisc=${{package.full-version}}
+    runtime:
+      - font-xorg-dirs
+
+environment:
+  contents:
+    packages:
+      - autoconf
+      - automake
+      - bdftopcf
+      - build-base
+      - busybox
+      - font-util
+      - font-util-dev
+      - fontconfig
+      - fontforge
+      - mkfontscale
+      - pkgconf-dev
+      - ttfautohint
+
+pipeline:
+  - uses: git-checkout
+    with:
+      repository: https://gitlab.freedesktop.org/xorg/font/misc-misc
+      tag: font-misc-misc-${{package.version}}
+      expected-commit: c4e2af05583764fae3d0b2aa20d5c93b031cbcbf
+
+  - uses: autoconf/configure
+
+  - uses: autoconf/make
+
+  - uses: autoconf/make-install
+
+  - name: Strip font indices since it conflicts with other font-xorg packages
+    runs: |
+      find "${{targets.destdir}}/usr/share/fonts/X11" \
+           -type f \( -name 'fonts.dir'   \
+                    -o -name 'fonts.scale' \
+                    -o -name 'fonts.alias' \) -delete
+
+update:
+  enabled: true
+  git:
+    strip-prefix: font-misc-misc-
+  ignore-regex-patterns:
+    - ^XORG-.*
+    - ^CYGWIN-.*
+    - ^lg3d-.*
+    - ^XACE-.*
+    - ^XEVIE-.*
+    - ^DAMAGE-.*
+    - ^COMPOSITE-.*
+    - ^XFIXES-.*
+    - ^sco_port_update-.*
+    - ^MODULAR_COPY$
+    - ^xf86-.*
+    - ^rel-.*
+    - ^IPv6-.*
+    - ^XPRINT.*
+    - ^before_.*
+    - ^xo-.*
+  schedule:
+    period: monthly
+    reason: This project doesn't do releases frequently
+
+test:
+  pipeline:
+    - uses: test/fonts
diff --git a/font-xorg-muttmisc.yaml b/font-xorg-muttmisc.yaml
new file mode 100644
index 00000000000..54c51e5cd6a
--- /dev/null
+++ b/font-xorg-muttmisc.yaml
@@ -0,0 +1,77 @@
+package:
+  name: font-xorg-muttmisc
+  version: 1.0.4
+  epoch: 0
+  description: X.Org Misc TTF bitmap fonts
+  copyright:
+    - license: MIT
+  dependencies:
+    provides:
+      - fonts-xorg-fontmuttmisc=${{package.full-version}}
+    runtime:
+      - font-xorg-dirs
+
+environment:
+  contents:
+    packages:
+      - autoconf
+      - automake
+      - bdftopcf
+      - build-base
+      - busybox
+      - font-util
+      - font-util-dev
+      - fontconfig
+      - fontforge
+      - mkfontscale
+      - pkgconf-dev
+      - ttfautohint
+
+pipeline:
+  - uses: git-checkout
+    with:
+      repository: https://gitlab.freedesktop.org/xorg/font/mutt-misc
+      tag: font-mutt-misc-${{package.version}}
+      expected-commit: 5550601d37efee5f29391973a7cd3ae4c837cd2f
+
+  - uses: autoconf/configure
+
+  - uses: autoconf/make
+
+  - uses: autoconf/make-install
+
+  - name: Strip font indices since it conflicts with other font-xorg packages
+    runs: |
+      find "${{targets.destdir}}/usr/share/fonts/X11" \
+           -type f \( -name 'fonts.dir'   \
+                    -o -name 'fonts.scale' \
+                    -o -name 'fonts.alias' \) -delete
+
+update:
+  enabled: true
+  git:
+    strip-prefix: font-mutt-misc-
+  ignore-regex-patterns:
+    - ^XORG-.*
+    - ^CYGWIN-.*
+    - ^lg3d-.*
+    - ^XACE-.*
+    - ^XEVIE-.*
+    - ^DAMAGE-.*
+    - ^COMPOSITE-.*
+    - ^XFIXES-.*
+    - ^sco_port_update-.*
+    - ^MODULAR_COPY$
+    - ^xf86-.*
+    - ^rel-.*
+    - ^IPv6-.*
+    - ^XPRINT.*
+    - ^before_.*
+    - ^xo-.*
+  schedule:
+    period: monthly
+    reason: This project doesn't do releases frequently
+
+test:
+  pipeline:
+    - uses: test/fonts
diff --git a/font-xorg.yaml b/font-xorg.yaml
index d7e4ba5e5fd..1dc5a38feea 100644
--- a/font-xorg.yaml
+++ b/font-xorg.yaml
@@ -1,7 +1,7 @@
 package:
   name: font-xorg
   version: 1
-  epoch: 1
+  epoch: 2
   description: "Meta package for X.Org fonts"
   dependencies:
     runtime:
@@ -17,12 +17,20 @@ package:
       - font-xorg-bhlucidatypewriter75dpi
       - font-xorg-bhtype1
       - font-xorg-bitstream100dpi
+      - font-xorg-bitstream75dpi
       - font-xorg-bitstreamtype1
+      - font-xorg-cronyxcyrillic
       - font-xorg-cursormisc
       - font-xorg-daewoomisc
       - font-xorg-decmisc
       - font-xorg-ibmtype1
       - font-xorg-isasmisc
+      - font-xorg-jismisc
+      - font-xorg-micromisc
+      - font-xorg-miscethiopic
+      - font-xorg-miscmeltho
+      - font-xorg-miscmisc
+      - font-xorg-muttmisc
       - font-xorg-schumachermisc
       - font-xorg-screencyrillic
       - font-xorg-sonymisc