diff --git a/ext/flatpak/ipscan b/ext/flatpak/ipscan
new file mode 100644
index 00000000..3f80f6b1
--- /dev/null
+++ b/ext/flatpak/ipscan
@@ -0,0 +1,5 @@
+#!/bin/bash
+java=$JAVA_HOME/bin/java
+[ ! -e "$java" ] && java=java
+
+"$java" --add-opens java.base/java.net=ALL-UNNAMED -jar /app/lib/ipscan/ipscan.jar "$@"
diff --git a/ext/flatpak/org.angryip.ipscan.desktop b/ext/flatpak/org.angryip.ipscan.desktop
new file mode 100644
index 00000000..a45ebc7c
--- /dev/null
+++ b/ext/flatpak/org.angryip.ipscan.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.5
+Type=Application
+Name=Angry IP Scanner
+Comment=Fast and friendly network scanner
+Categories=Application;Network;Utility
+Keywords=angry;ipscan;ip;scan;scanner
+Exec=ipscan
+Terminal=false
+Icon=org.angryip.ipscan
+StartupNotify=true
+StartupWMClass=Angry IP Scanner
diff --git a/ext/flatpak/org.angryip.ipscan.metainfo.xml b/ext/flatpak/org.angryip.ipscan.metainfo.xml
new file mode 100644
index 00000000..85bbb134
--- /dev/null
+++ b/ext/flatpak/org.angryip.ipscan.metainfo.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>org.angryip.ipscan</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-2.0+</project_license>
+    <name>Angry IP Scanner</name>
+    <developer id="org.angryip">
+        <name>Anton Keks and contributors</name>
+    </developer>
+    <summary>Fast and friendly network scanner</summary>
+    <content_rating type="oars-1.1" />
+
+    <description>
+        <p>Angry IP Scanner (or simply ipscan) is an open-source and cross-platform network scanner designed to be fast and simple to use. It scans IP addresses and ports, as well as having many other features.</p>
+        <p>It is widely used by network administrators and just curious users around the world, including large and small enterprises, banks, and government agencies.</p>
+    </description>
+
+    <screenshots>
+        <screenshot type="default">
+            <caption>A scan was performed</caption>
+            <image type="source">https://angryip.org/screenshots/ipscan-ubuntu.png</image>
+        </screenshot>
+    </screenshots>
+
+    <branding>
+        <color type="primary" scheme_preference="light">#9cdba6</color>
+        <color type="primary" scheme_preference="dark">#0d7c66</color>
+    </branding>
+
+    <categories>
+        <category>Network</category>
+        <category>Utility</category>
+    </categories>
+
+    <keywords>
+      <keyword>angry</keyword>
+      <keyword>ipscan</keyword>
+      <keyword>ip</keyword>
+      <keyword>scan</keyword>
+      <keyword>scanner</keyword>
+    </keywords>
+
+    <url type="homepage">https://angryip.org/</url>
+    <url type="bugtracker">https://github.com/angryip/ipscan/issues/</url>
+    <url type="faq">https://angryip.org/faq/</url>
+    <url type="help">https://angryip.org/documentation/</url>
+    <url type="vcs-browser">https://github.com/angryip/ipscan/</url>
+    <url type="contribute">https://angryip.org/contribute/</url>
+
+    <launchable type="desktop-id">org.angryip.ipscan.desktop</launchable>
+    <requires>
+        <internet>always</internet>
+    </requires>
+
+    <releases>
+        <release version="3.9.1" date="2023-02-11">
+            <url>https://github.com/angryip/ipscan/releases/tag/3.9.1</url>
+        </release>
+    </releases>
+</component>
diff --git a/ext/flatpak/org.angryip.ipscan.yaml b/ext/flatpak/org.angryip.ipscan.yaml
new file mode 100644
index 00000000..d617a1a0
--- /dev/null
+++ b/ext/flatpak/org.angryip.ipscan.yaml
@@ -0,0 +1,62 @@
+app-id: org.angryip.ipscan
+runtime: org.freedesktop.Platform
+runtime-version: '23.08'
+sdk: org.freedesktop.Sdk
+sdk-extensions:
+  - org.freedesktop.Sdk.Extension.openjdk11
+command: ipscan
+finish-args:
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=ipc
+  - --share=network
+  - --persist=.swt
+  - --persist=.java
+  - --env=PATH=/usr/bin:/app/bin:/app/jre/bin
+  - --env=JAVA_HOME=/app/jre
+modules:
+  - name: openjdk
+    buildsystem: simple
+    build-commands:
+      - /usr/lib/sdk/openjdk11/install.sh
+
+  - name: ipscan
+    buildsystem: simple
+    build-commands:
+      - install -Dm755 ipscan.jar -t /app/lib/ipscan
+      - install -Dm755 ipscan -t /app/bin
+      - install -Dm644 org.angryip.ipscan.desktop -t /app/share/applications
+      - install -Dm644 org.angryip.ipscan.metainfo.xml -t /app/share/metainfo
+      - install -Dm644 org.angryip.ipscan.svg -t /app/share/icons/hicolor/scalable/apps
+
+    sources:
+      - type: file
+        url: https://github.com/angryip/ipscan/releases/download/3.9.1/ipscan-linux64-3.9.1.jar
+        sha256: b8b12628c324cddb1e1a464c1caf2597b66ce8f5f1057ffa86c1fe7b1c241b40
+        dest-filename: ipscan.jar
+        only-arches: [x86_64]
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/angryip/ipscan/releases/latest
+          version-query: .tag_name
+          url-query: .assets[] | select(.name=="ipscan-linux64-" + $version + ".jar") | .browser_download_url
+
+      - type: file
+        url: https://raw.githubusercontent.com/angryip/ipscan/master/ext/flatpak/ipscan
+        sha256: afd4831d66797afff99429b4f76bf89a15c372a8e63b65ccbd494a0cb4c88c57
+        dest-filename: ipscan
+
+      - type: file
+        url: https://raw.githubusercontent.com/angryip/ipscan/master/ext/flatpak/org.angryip.ipscan.desktop
+        sha256: 7e8b9c719fcdaebf7f67938526590fad91018addf1bfc85c830aae888085fc19
+        dest-filename: org.angryip.ipscan.desktop
+
+      - type: file
+        url: https://raw.githubusercontent.com/angryip/ipscan/master/ext/flatpak/org.angryip.ipscan.metainfo.xml
+        sha256: fc977de31025e0f270a69ceb389c415444954a848c00a14f661260a6120a94f7
+        dest-filename: org.angryip.ipscan.metainfo.xml
+
+      - type: file
+        url: https://raw.githubusercontent.com/angryip/ipscan/b6e0b2c82a52298117e514d2f2196e26fa3ac418/resources/images/icon.svg
+        sha256: 1b2d31740d3d3bbd51d3d9a71d65d3859e38d10e99dd978d32fe86ed1e5d7416
+        dest-filename: org.angryip.ipscan.svg