diff --git a/flatpak/org.cadquery.cadquery-editor.desktop b/flatpak/org.cadquery.cadquery-editor.desktop
new file mode 100644
index 00000000..f157f4c7
--- /dev/null
+++ b/flatpak/org.cadquery.cadquery-editor.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+
+Type=Application
+Version=0.1
+Name=CaqQuery editor
+Comment=GUI editor for CadQuery, a parametric CAD scripting framework
+Path=/app/bin/
+Exec=CQ-editor
+Icon=org.cadquery.cadquery-editor
+Terminal=false
+Categories=Development;IDE
diff --git a/flatpak/org.cadquery.cadquery-editor.png b/flatpak/org.cadquery.cadquery-editor.png
new file mode 100644
index 00000000..9f67ddf4
Binary files /dev/null and b/flatpak/org.cadquery.cadquery-editor.png differ
diff --git a/flatpak/org.cadquery.cadquery-editor.yaml b/flatpak/org.cadquery.cadquery-editor.yaml
new file mode 100644
index 00000000..7b6e57a1
--- /dev/null
+++ b/flatpak/org.cadquery.cadquery-editor.yaml
@@ -0,0 +1,17 @@
+app-id: org.cadquery.cadquery-editor
+runtime: org.kde.Platform
+runtime-version: '5.12'
+sdk: org.kde.Sdk
+command: CQ-editor
+finish-args:
+  - --socket=fallback-x11
+  - --filesystem=home:rw
+modules:
+  - name: cadquery-editor
+    buildsystem: simple
+    build-commands:
+        - cp -r /run/build/cadquery-editor/ /app/bin/
+    sources:
+      - type: archive
+        url: https://github.com/CadQuery/CQ-editor/releases/download/0.1RC1/CQ-editor-0.1RC1-linux64.tar.bz2
+        sha256: 6e93272680db4ffc27795a71e0490d0809c63c151f25c49bd30322ed9a2fb636