diff --git a/flatpak/OpenAndroidInstaller.png b/flatpak/OpenAndroidInstaller.png
new file mode 100644
index 00000000..63856ab2
Binary files /dev/null and b/flatpak/OpenAndroidInstaller.png differ
diff --git a/flatpak/org.openandroidinstaller.OpenAndroidInstaller.desktop b/flatpak/org.openandroidinstaller.OpenAndroidInstaller.desktop
new file mode 100644
index 00000000..107382a8
--- /dev/null
+++ b/flatpak/org.openandroidinstaller.OpenAndroidInstaller.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+
+Name=OpenAndroidInstaller
+Comment= Makes installing alternative Android distributions nice and easy. 
+Categories=Utility;FileTools;
+
+Icon=OpenAndroidInstaller
+Exec=openandroidinstaller
+Terminal=false
diff --git a/flatpak/org.openandroidinstaller.OpenAndroidInstaller.metainfo.xml b/flatpak/org.openandroidinstaller.OpenAndroidInstaller.metainfo.xml
new file mode 100644
index 00000000..aa745b0a
--- /dev/null
+++ b/flatpak/org.openandroidinstaller.OpenAndroidInstaller.metainfo.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>org.openandroidinstaller.OpenAndroidInstaller</id>
+  
+  <name>OpenAndroidInstaller</name>
+  <summary> Makes installing alternative Android distributions nice and easy. </summary>
+  
+  <metadata_license>CC-BY-SA-4.0</metadata_license>
+  <project_license>GPL-3.0-or-later</project_license>
+  
+  <description>
+    <p>
+      The OpenAndroidInstaller project helps Android users to keep their smartphone&apos;s operating system up to date with free software and to continue using the device even though the manufacturer no longer offers updates. With a graphical installation software, users are easily guided through the installation process of free Android operating systems like LineageOS.
+    </p>
+  </description>
+  
+  <launchable type="desktop-id">org.openandroidinstaller.OpenAndroidInstaller.desktop</launchable>
+</component>
diff --git a/org.openandroidinstaller.OpenAndroidInstaller.yml b/org.openandroidinstaller.OpenAndroidInstaller.yml
new file mode 100644
index 00000000..8f4c6cf4
--- /dev/null
+++ b/org.openandroidinstaller.OpenAndroidInstaller.yml
@@ -0,0 +1,19 @@
+app-id: org.openandroidinstaller.OpenAndroidInstaller
+runtime: org.freedesktop.Platform
+runtime-version: '22.08'
+sdk: org.freedesktop.Sdk
+command: openandroidinstaller
+finish-args:
+  - --share=ipc
+  - --socket=x11
+  - --socket=wayland
+  - --filesystem=host
+  - --device=dri
+modules:
+  - name: OpenAndroidInstaller
+    buildsystem: simple
+    build-commands:
+      - install -D openandroidinstaller /app/bin/openandroidinstaller
+    sources:
+      - type: file
+        path: dist/openandroidinstaller