diff --git a/flathub.json b/flathub.json
index c75b742..3d69a98 100644
--- a/flathub.json
+++ b/flathub.json
@@ -1,3 +1,3 @@
 {
-    "only-arches": ["x86_64"]
+    "only-arches": ["x86_64", "aarch64"]
 }
diff --git a/org.ryujinx.Ryujinx.yml b/org.ryujinx.Ryujinx.yml
index 4426c27..8557ccc 100644
--- a/org.ryujinx.Ryujinx.yml
+++ b/org.ryujinx.Ryujinx.yml
@@ -29,6 +29,9 @@ modules:
       x86_64:
         env:
           RUNTIME: linux-x64
+      aarch64:
+        env:
+          RUNTIME: linux-arm64
     env:
       PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
@@ -41,7 +44,7 @@ modules:
   - |
     export PATH=$PATH:/run/build/Ryujinx/dotnet-sdk
     export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD)
-    export RUNTIME_FRAMEWORK_VERSION=$(find nuget-sources -name 'microsoft.netcore.app.runtime.linux-x64.*' | grep -oP '(\d.\d.\d+.nupkg)' | grep -oP '(\d.\d.\d+)')
+    export RUNTIME_FRAMEWORK_VERSION=$(find nuget-sources -name 'microsoft.netcore.app.runtime.$RUNTIME.*' | grep -oP '(\d.\d.\d+.nupkg)' | grep -oP '(\d.\d.\d+)')
     echo "Runtime framework version: $RUNTIME_FRAMEWORK_VERSION"
     sed -r --in-place "s/\%\%RYUJINX_BUILD_VERSION\%\%/$RYUJINX_VERSION/g;" src/Ryujinx.Common/ReleaseInformation.cs
     sed -r --in-place "s/\%\%RYUJINX_BUILD_GIT_HASH\%\%/$RYUJINX_GIT_SHORT_HASH/g;" src/Ryujinx.Common/ReleaseInformation.cs
@@ -57,7 +60,6 @@ modules:
     cp -r --remove-destination /run/build/Ryujinx/src/Ryujinx/bin/Release/net8.0/$RUNTIME/publish/* /app/bin/
     chmod +x /app/bin/Ryujinx.sh
     mkdir -p /app/lib/ffmpeg
-    ln -s /usr/lib/x86_64-linux-gnu/libX11.so.6 /app/lib/libX11.so
     install -Dm644 $FLATPAK_ID.appdata.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml
     install -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper
     install -Dm644 distribution/misc/Logo.svg /app/share/icons/hicolor/scalable/apps/ryujinx.svg
@@ -75,6 +77,16 @@ modules:
       type: rotating-url
       url: https://aka.ms/dotnet/8.0/dotnet-sdk-linux-x64.tar.gz
       pattern: https://dotnetcli.azureedge.net/dotnet/Sdk/^([\d\.a-z-]+)$/dotnet-sdk-^([\d\.a-z-]+)$-linux-x64.tar.gz
+  - type: archive
+    only-arches:
+    - aarch64
+    dest: dotnet-sdk
+    url: https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.101/dotnet-sdk-8.0.101-linux-arm64.tar.gz
+    sha256: 6e6d9c0d20e9b87247638eff4e66eccf04078ca956cecb9be53f155f44a2c508
+    x-checker-data:
+      type: rotating-url
+      url: https://aka.ms/dotnet/8.0/dotnet-sdk-linux-arm64.tar.gz
+      pattern: https://dotnetcli.azureedge.net/dotnet/Sdk/^([\d\.a-z-]+)$/dotnet-sdk-^([\d\.a-z-]+)$-linux-arm64.tar.gz
   - nuget_sources.json
   - type: git
     url: https://github.com/Ryujinx/Ryujinx.git