diff --git a/org.ppsspp.PPSSPP.yml b/org.ppsspp.PPSSPP.yml
index b62f1df..6b0e56a 100644
--- a/org.ppsspp.PPSSPP.yml
+++ b/org.ppsspp.PPSSPP.yml
@@ -2,6 +2,7 @@ app-id: org.ppsspp.PPSSPP
 runtime: org.freedesktop.Platform
 runtime-version: '22.08'
 sdk: org.freedesktop.Sdk
+separate-locales: false
 rename-icon: ppsspp
 rename-desktop-file: PPSSPPSDL.desktop
 command: PPSSPPSDL
@@ -14,6 +15,14 @@ finish-args:
   - --share=ipc
   - --share=network
   - --talk-name=org.freedesktop.ScreenSaver
+add-extensions:
+  org.ppsspp.PPSSPP.Locale:
+    directory: share/locale
+    bundle: true
+    no-autodownload: false
+    subdirectories: false
+    autodelete: true
+    locale-subset: true
 modules:
   - shared-modules/glu/glu-9.json
   - shared-modules/glew/glew.json
@@ -38,12 +47,15 @@ modules:
             - -DUSING_GLES2=ON
     post-install:
       - desktop-file-edit --set-name=PPSSPP ${FLATPAK_DEST}/share/applications/PPSSPPSDL.desktop
+      - install -Dm644 icons/icon-512.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ppsspp.svg
       - install -Dm644 ${FLATPAK_ID}.metainfo.xml -t ${FLATPAK_DEST}/share/metainfo
+    cleanup:
+      - /share/ppsspp/assets/lang/README.md
     sources:
       - type: git
-        url: https://github.com/hrydgard/ppsspp.git
-        tag: v1.13.2
-        commit: 9fe6338e3bf397f8a009a51a282c139dfa180eb6
+        url: &ppsspp-url https://github.com/hrydgard/ppsspp.git
+        tag: &ppsspp-tag v1.13.2
+        commit: &ppsspp-commit 9fe6338e3bf397f8a009a51a282c139dfa180eb6
         x-checker-data:
           type: git
           tag-pattern: ^v([\d.]+)$
@@ -51,3 +63,20 @@ modules:
 
       - type: file
         path: org.ppsspp.PPSSPP.metainfo.xml
+
+  - name: ppsspp-localization
+    buildsystem: simple
+    build-commands:
+      - |
+        for LANG_FILE in assets/lang/*.ini
+          do LANG_FILE_BASENAME="$(basename "$LANG_FILE")"
+          PPSSPP_LANG="$(grep -Eo '^[a-z]{2}' <<< "$LANG_FILE_BASENAME")"
+          ln -fsr "$FLATPAK_DEST/share/locale/$PPSSPP_LANG/ppsspp/$LANG_FILE_BASENAME" "$FLATPAK_DEST/share/ppsspp/$LANG_FILE"
+          install -Dm644 "$LANG_FILE" "$FLATPAK_DEST/share/locale/$PPSSPP_LANG/ppsspp/$LANG_FILE_BASENAME"
+        done
+    sources:
+      - type: git
+        url: *ppsspp-url
+        tag: *ppsspp-tag
+        commit: *ppsspp-commit
+        disable-submodules: true