diff --git a/packages/y/yquake2/files/org.yamagi.YamagiQ2.appdata.xml b/packages/y/yquake2/files/org.yamagi.YamagiQ2.appdata.xml
new file mode 100644
index 00000000000..672b7fe4eef
--- /dev/null
+++ b/packages/y/yquake2/files/org.yamagi.YamagiQ2.appdata.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<component type="desktop">
+  <id>org.yamagi.YamagiQ2</id>
+  <name>Yamagi Quake II</name>
+  <summary>Yamagi Quake II is an alternative client for id Software's Quake II</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0-or-later</project_license>
+
+  <developer_name>Yamagi team</developer_name>
+
+  <url type="homepage">https://www.yamagi.org/quake2//</url>
+  <url type="bugtracker">https://github.com/yquake2</url>
+  <url type="help">https://github.com/yquake2/yquake2/blob/master/doc/01_index.md</url>
+
+  <launchable type="desktop-id">yquake2.desktop</launchable>
+
+  <description>
+    <p>
+     Yamagi Quake II is an alternative client for id Software's Quake II. Our goal is to provide the best Quake II experience possible, we strive to preserve the gameplay as it was back in 1997. Thus we aim mostly for bug fixes, stability and gentle enhancements were appropriate. Yamagi Quake II has a lot of unique features. The most notables ones are:
+    </p>
+    <ul>
+      <li>A modern OpenGL 3.2 renderer, providing a greatly enhanced look and feel. The original OpenGL 1.4 and even the Software renderers are still supported. Both 3D accelerated renderers support anisotropic filtering and multisampling anti aliasing.</li>
+      <li>Full support for widescreen displays and arbitrary resolutions. The HUD can be scaled to be readable on high resolutions. </li>
+      <li>Support for surround sound, from stereo up to 7.1 channels and even HRTF. The background music can be played from OGG/Vorbis files, a CD drive is no longer necessary.</li>
+      <li>A rewritten savegame system. Yamagi Quake II savegames are completely reliable and backward compatible between releases as long as the principle architecture stays the same.</li>
+      <li>Highly precise timings. For example, on a flat panel display with a 59.95 hertz refresh rate and vertical synchronisation (VSync) enabled Yamagi Quake II is running at exactly 59.95 frames per second.</li>
+      <li>In comparison with the original client over 1.500 bugs were fixed. The Yamagi Quake II client is very well tested and stable. The dedicated server is able to run for weeks without a single restart. Last but not least the code is fully 64 bit clean and highly portable.</li>
+    </ul>
+    <p>
+     Commercial data files are required to run the supported game. These can be aquired though a multitude of sources. See the manual for more info on this.
+    </p>
+  </description>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/flathub/org.yamagi.YamagiQ2/master/images/image_01.png</image>
+      <caption>Guards in the palace</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/flathub/org.yamagi.YamagiQ2/master/images/image_02.png</image>
+      <caption>Deathmatch on Q2DM1</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/flathub/org.yamagi.YamagiQ2/master/images/image_03.png</image>
+      <caption>Entering the Strogg world</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/flathub/org.yamagi.YamagiQ2/master/images/image_04.png</image>
+      <caption>Prison complex</caption>
+    </screenshot>
+  </screenshots>
+
+  <content_rating type="oars-1.1">
+    <!-- PEGI gives it 16+ in 2004 -->
+    <content_attribute id="violence-realistic">moderate</content_attribute>
+    <content_attribute id="violence-bloodshed">moderate</content_attribute>
+    <!-- The amount of torture and human suffering is not insignificant with the Strogg -->
+    <content_attribute id="violence-desecration">moderate</content_attribute>
+    <!-- Full multiplayer functionality -->
+    <content_attribute id="social-chat">intense</content_attribute>
+  </content_rating>
+</component>
+
diff --git a/packages/y/yquake2/monitoring.yml b/packages/y/yquake2/monitoring.yml
new file mode 100644
index 00000000000..a6e8560de48
--- /dev/null
+++ b/packages/y/yquake2/monitoring.yml
@@ -0,0 +1,6 @@
+releases:
+  id: 11482
+  rss: https://github.com/yquake2/yquake2/tags.atom
+# No known CPE, checked 2024-08-09
+security:
+  cpe: ~
diff --git a/packages/y/yquake2/package.yml b/packages/y/yquake2/package.yml
index 59fbc7edc8e..5b59a0db959 100644
--- a/packages/y/yquake2/package.yml
+++ b/packages/y/yquake2/package.yml
@@ -1,6 +1,6 @@
 name       : yquake2
 version    : '8.30'
-release    : 21
+release    : 22
 source     :
     - https://github.com/yquake2/yquake2/archive/refs/tags/QUAKE2_8_30.tar.gz : 388ba424cbe29e4a8e8dda0d448676600a00c66e3e4edc2b9660b551e19a3095
 license    : GPL-2.0-or-later
@@ -30,6 +30,7 @@ install    : |
     install -Dm00644 release/ref_gles3.so $installdir/usr/share/yquake2/ref_gles3.so
     install -Dm00644 stuff/icon/Quake2.png $installdir/usr/share/pixmaps/quake2.png
     install -Dm00644 $pkgfiles/yquake2.desktop $installdir/usr/share/applications/yquake2.desktop
+    install -Dm00644 $pkgfiles/org.yamagi.YamagiQ2.appdata.xml $installdir/usr/share/metainfo/org.yamagi.YamagiQ2.appdata.xml
 
     install -dm00755 $installdir/usr/bin
     ln -s /usr/share/yquake2/quake2 $installdir/usr/bin/quake2
diff --git a/packages/y/yquake2/pspec_x86_64.xml b/packages/y/yquake2/pspec_x86_64.xml
index c414d339cc3..0ae4ee6767f 100644
--- a/packages/y/yquake2/pspec_x86_64.xml
+++ b/packages/y/yquake2/pspec_x86_64.xml
@@ -3,8 +3,8 @@
         <Name>yquake2</Name>
         <Homepage>https://www.yamagi.org/quake2/</Homepage>
         <Packager>
-            <Name>Alexander Vorobyev</Name>
-            <Email>avorobyev@protonmail.com</Email>
+            <Name>Muhammad Alfi Syahrin</Name>
+            <Email>malfisya.dev@hotmail.com</Email>
         </Packager>
         <License>GPL-2.0-or-later</License>
         <PartOf>games.action</PartOf>
@@ -25,6 +25,7 @@ Game data must be placed in ~/.yq2/baseq2.
             <Path fileType="executable">/usr/bin/q2ded</Path>
             <Path fileType="executable">/usr/bin/quake2</Path>
             <Path fileType="data">/usr/share/applications/yquake2.desktop</Path>
+            <Path fileType="data">/usr/share/metainfo/org.yamagi.YamagiQ2.appdata.xml</Path>
             <Path fileType="data">/usr/share/pixmaps/quake2.png</Path>
             <Path fileType="data">/usr/share/yquake2/baseq2/game.so</Path>
             <Path fileType="data">/usr/share/yquake2/q2ded</Path>
@@ -36,12 +37,12 @@ Game data must be placed in ~/.yq2/baseq2.
         </Files>
     </Package>
     <History>
-        <Update release="21">
-            <Date>2023-11-27</Date>
+        <Update release="22">
+            <Date>2024-08-09</Date>
             <Version>8.30</Version>
             <Comment>Packaging update</Comment>
-            <Name>Alexander Vorobyev</Name>
-            <Email>avorobyev@protonmail.com</Email>
+            <Name>Muhammad Alfi Syahrin</Name>
+            <Email>malfisya.dev@hotmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file