diff --git a/packages/m/maelstrom/abi_libs b/packages/m/maelstrom/abi_libs
new file mode 100644
index 000000000000..5d4eef823116
--- /dev/null
+++ b/packages/m/maelstrom/abi_libs
@@ -0,0 +1 @@
+Maelstrom
diff --git a/packages/m/maelstrom/abi_symbols b/packages/m/maelstrom/abi_symbols
new file mode 100644
index 000000000000..3bfea3b8163e
--- /dev/null
+++ b/packages/m/maelstrom/abi_symbols
@@ -0,0 +1 @@
+Maelstrom:main
diff --git a/packages/m/maelstrom/abi_used_symbols b/packages/m/maelstrom/abi_used_symbols
index d9c1903e8ecb..95cbad09f149 100644
--- a/packages/m/maelstrom/abi_used_symbols
+++ b/packages/m/maelstrom/abi_used_symbols
@@ -91,6 +91,7 @@ libc.so.6:__ctype_toupper_loc
 libc.so.6:__cxa_atexit
 libc.so.6:__errno_location
 libc.so.6:__fprintf_chk
+libc.so.6:__isoc23_strtol
 libc.so.6:__libc_start_main
 libc.so.6:__printf_chk
 libc.so.6:__stack_chk_fail
@@ -119,7 +120,6 @@ libc.so.6:strerror
 libc.so.6:strlen
 libc.so.6:strncmp
 libc.so.6:strrchr
-libc.so.6:strtol
 libc.so.6:time
 libc.so.6:umask
 libgcc_s.so.1:_Unwind_Resume
diff --git a/packages/m/maelstrom/files/Maelstrom-install.patch b/packages/m/maelstrom/files/maelstrom-install.patch
similarity index 100%
rename from packages/m/maelstrom/files/Maelstrom-install.patch
rename to packages/m/maelstrom/files/maelstrom-install.patch
diff --git a/packages/m/maelstrom/files/maelstrom.png b/packages/m/maelstrom/files/maelstrom.png
index 040bd7ce36c2..129dcfabc199 100644
Binary files a/packages/m/maelstrom/files/maelstrom.png and b/packages/m/maelstrom/files/maelstrom.png differ
diff --git a/packages/m/maelstrom/files/org.libsdl.Maelstrom.appdata.xml b/packages/m/maelstrom/files/org.libsdl.Maelstrom.appdata.xml
new file mode 100644
index 000000000000..09f7ab76b869
--- /dev/null
+++ b/packages/m/maelstrom/files/org.libsdl.Maelstrom.appdata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+  <id type="desktop">org.libsdl.Maelstrom.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+ and CC-BY-3.0</project_license>
+  <developer_name>Ambrosia Software</developer_name>
+  <name>Maelstrom</name>
+  <summary>High Quality Asteroids Clone</summary>
+  <description>
+    <p>You pilot your ship through the dreaded "Maelstrom" asteroid belt -- suddenly your best friend thrusts towards you and fires, directly at your cockpit. You raise your shields just in time, and the battle is joined.</p>
+    <p>The deadliest stretch of space known to mankind has just gotten deadlier. Everywhere massive asteroids jostle for a chance to crush your ship, and deadly shinobi fighter patrols pursue you across the asteroid belt. But the deadliest of them all is your sister ship, assigned to you on patrol. The pilot, trained by your own Navy, battle hardened by months in the Maelstrom, is equipped with a twin of your own ship and intimate knowledge of your tactics.</p>
+    <p>The lovely Stratocaster R&amp;R facility never sounded so good, but as you fire full thrusters to dodge the latest barrage you begin to think you'll never get home...</p>
+  </description>
+  <content_rating type="oars-1.1" />
+  <url type="homepage">https://www.libsdl.org/projects/Maelstrom/</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://upload.wikimedia.org/wikipedia/commons/4/44/Maelstrom_screenshot.png</image>
+    </screenshot>
+  </screenshots>
+  <releases>
+    <release version="3.0.7" date="2021-02-04"/>
+  </releases>
+</application>
diff --git a/packages/m/maelstrom/files/Maelstrom.desktop b/packages/m/maelstrom/files/org.libsdl.Maelstrom.desktop
similarity index 85%
rename from packages/m/maelstrom/files/Maelstrom.desktop
rename to packages/m/maelstrom/files/org.libsdl.Maelstrom.desktop
index 8d70cc117203..c5aeda78db28 100644
--- a/packages/m/maelstrom/files/Maelstrom.desktop
+++ b/packages/m/maelstrom/files/org.libsdl.Maelstrom.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=Maelstrom
-Exec=Maelstrom
-Icon=maelstrom.png
+Exec=maelstrom
+Icon=maelstrom
 Comment=Space combat game
 Name=Maelstrom
 StartupNotify=false
@@ -9,3 +9,4 @@ Terminal=false
 Type=Application
 Categories=Game;ArcadeGame;
 Keywords=game;arcade;space;shooter;asteroids;
+
diff --git a/packages/m/maelstrom/files/series b/packages/m/maelstrom/files/series
index 81463a288a71..aff7f0d5125e 100644
--- a/packages/m/maelstrom/files/series
+++ b/packages/m/maelstrom/files/series
@@ -1,2 +1,2 @@
-Maelstrom-install.patch
+maelstrom-install.patch
 fix-button-code.patch
diff --git a/packages/m/maelstrom/package.yml b/packages/m/maelstrom/package.yml
index 660a56c89f94..58770ae3cf80 100644
--- a/packages/m/maelstrom/package.yml
+++ b/packages/m/maelstrom/package.yml
@@ -1,11 +1,12 @@
 name       : maelstrom
 version    : 3.0.7
-release    : 7
+release    : 8
 source     :
     - https://www.libsdl.org/projects/Maelstrom/src/Maelstrom-3.0.7.tar.gz : 93680322f4b04d4727ea8e0b461f259b604dc69e7465cb91d2b9aad378a9a036
+homepage   : https://www.libsdl.org/projects/Maelstrom/
 license    :
-    - GPL-2.0
-    - CC-By-3.0
+    - GPL-2.0-or-later
+    - CC-BY-3.0
 component  : games.arcade
 summary    : Pseudo-3D-rendered Asteroids clone
 description: |
@@ -20,10 +21,11 @@ build      : |
     %make -j1
 install    : |
     %make_install -j1
-
+    # Install game data and symlink to binary
     export msdir=/usr/share/Maelstrom
     install -dm00755 $installdir/usr/bin
-    ln -s $msdir/Maelstrom $installdir/usr/bin/Maelstrom
-
-    install -Dm00644 $pkgfiles/Maelstrom.desktop $installdir/usr/share/applications/Maelstrom.desktop
-    install -Dm00644 $pkgfiles/maelstrom.png $installdir/usr/share/pixmaps/maelstrom.png
+    ln -s $msdir/Maelstrom $installdir/usr/bin/maelstrom
+    # Install desktop file, icon and appstream metadata
+    install -Dm00644 $pkgfiles/org.libsdl.Maelstrom.desktop -t $installdir/usr/share/applications
+    install -Dm00644 $pkgfiles/maelstrom.png -t $installdir/usr/share/icons/hicolor/512x512/apps
+    install -Dm00644 $pkgfiles/org.libsdl.Maelstrom.appdata.xml -t $installdir/usr/share/metainfo
diff --git a/packages/m/maelstrom/pspec_x86_64.xml b/packages/m/maelstrom/pspec_x86_64.xml
index 0b620e8a8b1b..13f0ebd7fb8e 100644
--- a/packages/m/maelstrom/pspec_x86_64.xml
+++ b/packages/m/maelstrom/pspec_x86_64.xml
@@ -1,17 +1,18 @@
 <PISI>
     <Source>
         <Name>maelstrom</Name>
+        <Homepage>https://www.libsdl.org/projects/Maelstrom/</Homepage>
         <Packager>
-            <Name>Thomas Staudinger</Name>
-            <Email>Staudi.Kaos@gmail.com</Email>
+            <Name>Muhammad Alfi Syahrin</Name>
+            <Email>malfisya.dev@hotmail.com</Email>
         </Packager>
-        <License>GPL-2.0</License>
-        <License>CC-By-3.0</License>
+        <License>GPL-2.0-or-later</License>
+        <License>CC-BY-3.0</License>
         <PartOf>games.arcade</PartOf>
         <Summary xml:lang="en">Pseudo-3D-rendered Asteroids clone</Summary>
         <Description xml:lang="en">Pseudo-3D-rendered Asteroids clone
 </Description>
-        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://sources.getsol.us/README.Solus</Archive>
     </Source>
     <Package>
         <Name>maelstrom</Name>
@@ -20,7 +21,7 @@
 </Description>
         <PartOf>games.arcade</PartOf>
         <Files>
-            <Path fileType="executable">/usr/bin/Maelstrom</Path>
+            <Path fileType="executable">/usr/bin/maelstrom</Path>
             <Path fileType="data">/usr/share/Maelstrom/COPYING</Path>
             <Path fileType="data">/usr/share/Maelstrom/COPYING.GPL</Path>
             <Path fileType="data">/usr/share/Maelstrom/Docs/Ambrosia_Software,_Inc._FAQ.txt</Path>
@@ -67,17 +68,18 @@
             <Path fileType="data">/usr/share/Maelstrom/README.txt</Path>
             <Path fileType="data">/usr/share/Maelstrom/icon.bmp</Path>
             <Path fileType="data">/usr/share/Maelstrom/icon.xpm</Path>
-            <Path fileType="data">/usr/share/applications/Maelstrom.desktop</Path>
-            <Path fileType="data">/usr/share/pixmaps/maelstrom.png</Path>
+            <Path fileType="data">/usr/share/applications/org.libsdl.Maelstrom.desktop</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/512x512/apps/maelstrom.png</Path>
+            <Path fileType="data">/usr/share/metainfo/org.libsdl.Maelstrom.appdata.xml</Path>
         </Files>
     </Package>
     <History>
-        <Update release="7">
-            <Date>2022-08-22</Date>
+        <Update release="8">
+            <Date>2024-01-23</Date>
             <Version>3.0.7</Version>
             <Comment>Packaging update</Comment>
-            <Name>Thomas Staudinger</Name>
-            <Email>Staudi.Kaos@gmail.com</Email>
+            <Name>Muhammad Alfi Syahrin</Name>
+            <Email>malfisya.dev@hotmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file