diff --git a/flatpak/Makefile b/flatpak/Makefile
index 8c07db1..d49bf0b 100644
--- a/flatpak/Makefile
+++ b/flatpak/Makefile
@@ -1,6 +1,18 @@
+manifest = ch.tigerjython.TigerJython2.yml
+gpg = beat@git.jdmweb2.ch
 build:
+	flatpak uninstall --noninteractive ch.tigerjython.TigerJython2 > /dev/null || true
 	flatpak-builder --install --user --force-clean build-dir ch.tigerjython.TigerJython2.yml
 run:
 	flatpak run --nosocket=fallback-x11 --socket=x11 ch.tigerjython.TigerJython2
 sh:
 	flatpak run --command=sh ch.tigerjython.TigerJython2
+
+#https://docs.flathub.org/docs/for-app-authors/submission/
+sub_build:
+	# flatpak run org.flatpak.Builder --force-clean --sandbox --user --install --install-deps-from=flathub --ccache --mirror-screenshots-url=https://dl.flathub.org/repo/screenshots --repo=repo builddir ch.tigerjython.TigerJython2.yml
+	# 	flatpak run org.flatpak.Builder --force-clean --sandbox --user --install --ccache --mirror-screenshots-url=https://dl.flathub.org/repo/screenshots --repo=repo builddir ch.tigerjython.TigerJython2.yml
+	# flatpak --user install -y --noninteractive flathub org.freedesktop.Sdk/x86_64/23.08
+	flatpak-builder --gpg-sign=beat@git.jdmweb2.ch --force-clean --sandbox --user --install --install-deps-from=flathub --ccache --mirror-screenshots-url=https://dl.flathub.org/repo/screenshots --repo=repo builddir ${manifest}
+sub_lint:
+	flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest ${manifest}
diff --git a/flatpak/ch.tigerjython.TigerJython2.yml b/flatpak/ch.tigerjython.TigerJython2.yml
index 83e80d1..cc256e3 100644
--- a/flatpak/ch.tigerjython.TigerJython2.yml
+++ b/flatpak/ch.tigerjython.TigerJython2.yml
@@ -1,6 +1,6 @@
 id: ch.tigerjython.TigerJython2
+branch: '2.39'
 runtime: org.freedesktop.Platform
-# runtime: org.freedesktop.Sdk.Extension.openjdk
 runtime-version: '23.08'
 sdk: org.freedesktop.Sdk
 sdk-extensions:
@@ -20,24 +20,30 @@ modules:
       - install -Dm644 Lib/* /app/tigerjython/Lib
       - install -Dm644 TestSamples/* /app/tigerjython/TestSamples
       - install -m755 tigerjython2.jar /app/tigerjython/tigerjython2.jar
-      - install -m755 tigerjython /app/tigerjython/tigerjython.sh
+      - install -m755 tigerjython /app/tigerjython/tigerjython
 
     sources:
       - type: archive
-        path: TigerJython.tar.gz
+        url: https://git.jdmweb2.ch/beat/tigerjython_pkg/raw/tag/V2.39/TigerJython.tar.gz
+        sha256: 5961b11112ad27d4831d47d3422baa41d1ba8059e8dde3db2e4c4a8759aad607
 finish-args:
-  - --env=PATH=/app/jre/bin:/usr/bin
+  - --env=PATH=/app/tigerjython:/app/jre/bin:/usr/bin
   # X11 + XShm access
   - --share=ipc
-  - --socket=fallback-x11
+  # - --socket=fallback-x11
   # Wayland access
-  - --socket=wayland
+  - --socket=x11
   # GPU acceleration if needed
   - --device=dri
   # Needs to talk to the network:
   - --share=network
   # Needs to save files locally
   - --filesystem=xdg-documents
-# command: java -jar tigerjython2.jar
-# command: java --version
-command: /app/tigerjython/tigerjython.sh
+
+## Error: Command 'tigerjython' not found
+# command: tigerjython
+
+## WARNING: toplevel-command-is-path
+## https://github.com/flathub-infra/flatpak-builder-lint/issues/23
+command: /app/tigerjython/tigerjython
+