diff --git a/misc/linux/flatpak/net.classicube.flatpak.client.desktop b/misc/linux/flatpak/net.classicube.flatpak.client.desktop
new file mode 100644
index 000000000..11f416da3
--- /dev/null
+++ b/misc/linux/flatpak/net.classicube.flatpak.client.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=ClassiCube
+Exec=ClassiCubeLauncher
+Comment=Sandbox building-block game
+Type=Application
+Icon=net.classicube.flatpak.client
+Categories=Game;ActionGame;
+Terminal=false
+MimeType=x-scheme-handler/mc;
+StartupWMClass=net.classicube.flatpak.client
\ No newline at end of file
diff --git a/misc/linux/flatpak/net.classicube.flatpak.client.metainfo.xml b/misc/linux/flatpak/net.classicube.flatpak.client.metainfo.xml
new file mode 100644
index 000000000..bcdbe339e
--- /dev/null
+++ b/misc/linux/flatpak/net.classicube.flatpak.client.metainfo.xml
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8'?>
+<component type="desktop-application">
+  <id>net.classicube.flatpak.client</id>
+  <name>ClassiCube</name>
+  <summary>Sandbox building-block game</summary>
+  <developer id="net.classicube">
+    <name>The ClassiCube Project</name>
+  </developer>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>BSD-3-Clause</project_license>
+  <description>
+    <p>ClassiCube brings you back to the days of 2009 where one block game ruled them all, it includes such features as:</p>
+    <ul>
+      <li>Loads of blocks and items to choose from</li>
+      <li>Chatting with other players</li>
+      <li>An extremely simple network protocol to tinker with</li>
+      <li>Hundreds of creative and inventive worlds to explore online</li>
+      <li>A growing community</li>
+      <li>Hundreds of hours of entertainment</li>
+    </ul>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <caption>Classic mode features faithful classic gameplay</caption>
+      <image type="source">https://github.com/ClassiCube/ClassiCube/assets/6509348/eedee53f-f53e-456f-b51c-92c62079eee0</image>
+    </screenshot>
+    <screenshot>
+      <caption>Enhanced mode allows hacks like flying and noclipping, it also allows servers to provide many custom features</caption>
+      <image type="source">https://github.com/ClassiCube/ClassiCube/assets/6509348/b2fe0e2b-5d76-41ab-909f-048d0ad15f37</image>
+    </screenshot>
+  </screenshots>
+  <releases>
+    <release version="1.3.6" date="2023-08-28" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.6</url>
+    </release>
+    <release version="1.3.5" date="2023-01-06" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.5</url>
+    </release>
+    <release version="1.3.4" date="2022-11-01" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.4</url>
+    </release>
+    <release version="1.3.3" date="2022-10-08" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.3</url>
+    </release>
+    <release version="1.3.2" date="2022-05-26" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.2</url>
+    </release>
+    <release version="1.3.1" date="2022-01-11" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.1</url>
+    </release>
+    <release version="1.3.0" date="2022-01-04" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.0</url>
+    </release>
+    <release version="1.2.9" date="2021-10-18" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.9</url>
+    </release>
+    <release version="1.2.8" date="2021-09-18" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.8</url>
+    </release>
+    <release version="1.2.7" date="2021-07-22" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.7</url>
+    </release>
+    <release version="1.2.6" date="2021-07-02" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.6</url>
+    </release>
+    <release version="1.2.5" date="2021-04-02" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.5</url>
+    </release>
+    <release version="1.2.4" date="2021-01-23" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.4</url>
+    </release>
+    <release version="1.2.3" date="2020-12-12" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.3</url>
+    </release>
+    <release version="1.2.2" date="2020-12-11" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.2</url>
+    </release>
+    <release version="1.2.1" date="2020-11-28" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.1</url>
+    </release>
+    <release version="1.2.0" date="2020-10-01" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.0</url>
+    </release>
+    <release version="1.1.9" date="2020-08-16" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.9</url>
+    </release>
+    <release version="1.1.8" date="2020-08-05" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.8</url>
+    </release>
+    <release version="1.1.7" date="2020-06-13" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.7</url>
+    </release>
+    <release version="1.1.6" date="2020-05-07" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.6</url>
+    </release>
+    <release version="1.1.5" date="2020-05-01" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.5</url>
+    </release>
+    <release version="1.1.4" date="2020-04-21" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.4</url>
+    </release>
+    <release version="1.1.3" date="2020-03-08" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.3</url>
+    </release>
+    <release version="1.1.2" date="2020-01-26" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.2</url>
+    </release>
+    <release version="1.1.1" date="2019-12-16" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.1</url>
+    </release>
+    <release version="1.10" date="2019-11-09" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.10</url>
+    </release>
+    <release version="1.0.9" date="2019-11-02" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.0.9</url>
+    </release>
+    <release version="1.0.8" date="2019-10-02" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.0.8</url>
+    </release>
+    <release version="1.0.7" date="2019-08-29" type="stable">
+      <url>https://github.com/ClassiCube/ClassiCube/releases/tag/1.0.7</url>
+    </release>
+  </releases>
+  <url type="homepage">https://www.classicube.net/</url>
+  <url type="bugtracker">https://github.com/ClassiCube/ClassiCube/issues</url>
+  <url type="donation">https://www.patreon.com/ClassiCube</url>
+  <url type="vcs-browser">https://github.com/ClassiCube/ClassiCube</url>
+  <categories>
+    <category>Game</category>
+    <category>AdventureGame</category>
+    <category>ActionGame</category>
+  </categories>
+  <recommends>
+    <control>pointing</control>
+    <control>keyboard</control>
+  </recommends>
+  <content_rating type="oars-1.1">
+    <content_attribute id="violence-cartoon">moderate</content_attribute>
+    <content_attribute id="social-chat">intense</content_attribute>
+  </content_rating>
+  <launchable type="desktop-id">net.classicube.flatpak.client.desktop</launchable>
+  <provides>
+    <binary>ClassiCube</binary>
+  </provides>
+</component>
diff --git a/misc/linux/flatpak/net.classicube.flatpak.client.svg b/misc/linux/flatpak/net.classicube.flatpak.client.svg
new file mode 100644
index 000000000..44324156b
--- /dev/null
+++ b/misc/linux/flatpak/net.classicube.flatpak.client.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="128"
+   height="127.99999"
+   viewBox="0 0 33.866667 33.866664"
+   version="1.1"
+   id="svg8"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(5.8338447,-13.20144)">
+    <g
+       id="g4741"
+       transform="matrix(0.12177585,0,0,0.12056875,-1.6325083,12.971524)">
+      <path
+         id="path4737"
+         d="M -5.8338447,207.40561 V 78.28894 L 106.61407,13.20144 218.79741,78.28894 V 207.40561 L 106.61407,272.4931 Z"
+         style="fill:#f6f6f6;stroke:#000000;stroke-width:8.0626;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path179"
+         d="m 104.07502,141.52929 110.68965,-60.9215 1.62598,125.47985 -109.78346,61.73499 z m 20.61272,94.64566 c 8.561,-1.36503 22.58979,-6.90566 34.77207,-13.73314 8.44846,-4.73489 17.45957,-10.82064 25.81752,-17.43613 8.72093,-6.90281 17.22731,-15.21726 18.55921,-18.14047 0.26981,-0.59217 0.24879,-0.77358 -0.13391,-1.15568 -0.36305,-0.36248 -0.91552,-0.44887 -2.7589,-0.43139 -3.71393,0.0352 -9.27509,1.35366 -16.28846,3.86168 -2.01562,0.7208 -3.69686,1.27297 -3.73608,1.22704 -0.16881,-0.19764 3.44601,-29.37179 6.84564,-55.24912 1.21398,-9.24057 2.15592,-16.89033 2.09321,-16.99948 -0.19747,-0.34365 -6.05941,-0.21541 -8.74964,0.19141 -11.67357,1.7653 -26.1385,9.31897 -38.83406,20.27938 -3.00232,2.59198 -8.66363,8.37481 -10.38554,10.60847 l -1.13332,1.47013 1.06078,5.78494 c 1.66864,9.09991 3.21014,18.62874 5.55847,34.35994 1.6265,10.89577 2.70193,17.7159 2.81167,17.83099 0.23021,0.24143 9.15704,-3.22834 13.96159,-5.42672 4.01374,-1.83655 7.38001,-3.77497 13.6069,-7.83534 5.39432,-3.51748 6.57616,-4.09382 7.18285,-3.50281 1.32604,1.29178 -3.92898,6.46583 -11.75312,11.57204 -5.59387,3.65069 -11.90727,6.67998 -18.54423,8.8979 -3.61228,1.20714 -3.99351,1.40207 -6.48521,3.316 -7.13359,5.47947 -15.77323,13.5129 -18.33378,17.04736 -1.39429,1.92461 -1.60126,3.07547 -0.62376,3.46838 0.81553,0.3278 3.41645,0.32525 5.4901,-0.005 z"
+         style="fill:#cbcbcb;fill-opacity:1;stroke-width:0.264583" />
+    </g>
+  </g>
+</svg>
diff --git a/misc/linux/flatpak/net.classicube.flatpak.client.yml b/misc/linux/flatpak/net.classicube.flatpak.client.yml
new file mode 100644
index 000000000..760e8b9d2
--- /dev/null
+++ b/misc/linux/flatpak/net.classicube.flatpak.client.yml
@@ -0,0 +1,29 @@
+id: net.classicube.flatpak.client
+runtime: org.freedesktop.Platform
+runtime-version: '23.08'
+sdk: org.freedesktop.Sdk
+command: ClassiCubeLauncher
+finish-args:
+  - --socket=x11
+  - --device=dri
+  - --share=network
+  - --share=ipc
+  - --socket=pulseaudio
+modules:
+  - name: ClassiCube
+    buildsystem: simple
+    build-commands:
+      - gcc -fno-math-errno src/*.c -o src/ClassiCube -O1 -DCC_BUILD_FLATPAK -DCC_BUILD_GLMODERN -rdynamic -lm -lpthread -lX11 -lXi -lGL -ldl
+      - install -Dm755 src/ClassiCube -t ${FLATPAK_DEST}/bin
+      - install -Dm755 ClassiCubeLauncher -t ${FLATPAK_DEST}/bin
+      - install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/net.classicube.flatpak.client.svg
+      - install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.desktop ${FLATPAK_DEST}/share/applications/net.classicube.flatpak.client.desktop
+      - install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.metainfo.xml ${FLATPAK_DEST}/share/metainfo/net.classicube.flatpak.client.metainfo.xml
+    sources:
+      - type: dir
+        path: ../../../
+      - type: script
+        dest-filename: ClassiCubeLauncher
+        commands:
+         - mkdir -p ${XDG_DATA_HOME}/ClassiCube
+         - cd ${XDG_DATA_HOME}/ClassiCube && exec /app/bin/ClassiCube "$@"