diff --git a/plugins/flatpak/README.md b/plugins/flatpak/README.md
new file mode 100644
index 000000000..f9ab53d52
--- /dev/null
+++ b/plugins/flatpak/README.md
@@ -0,0 +1,27 @@
+# Flatpak Plugin
+
+This plugin adds some aliases and functions for Flatpak package manager using the `flatpak` command. 
+
+```zsh
+plugins=(... flatpak)
+```
+
+## Aliases
+
+| Alias    | Command                      | Description                                       |
+| :------- | :--------------------------- | :------------------------------------------------ |
+| flatin   | `flatpak install`            | Installs an application or runtime                |
+| flatup   | `flatpak update`             | Update an installed application or runtime        |
+| flatun   | `flatpak uninstall`          | Uninstall an installed application or runtime     |
+| flatls   | `flatpak list`               | List installed apps and/or runtimes               |
+| flatpin  | `flatpak pin`                | Pin a runtime to prevent automatic removal        |
+| flatinf  | `flatpak info`               | Show info for installed app or runtime            |
+| flathis  | `flatpak history`            | Show history                                      |
+| flatrep  | `flatpak repair`             | Repair flatpak installation                       |
+| flatcfg  | `flatpak config`             | Configure flatpak                                 |
+| flatbak  | `flatpak create-usb`         | Put applications or runtimes onto removable media |
+| flatmask | `flatpak mask`               | Mask out updates and automatic installation       |
+| flatfind | `flatpak search`             | Search for remote apps/runtimes                   |
+| flatrun  | `flatpak run`                | Run an application                                |
+| flatps   | `flatpak ps`                 | Enumerate running applications                    |
+| flatkill | `flatpak kill`               | Stop a running application                        |
\ No newline at end of file
diff --git a/plugins/flatpak/flatpak.plugin.zsh b/plugins/flatpak/flatpak.plugin.zsh
new file mode 100644
index 000000000..534420503
--- /dev/null
+++ b/plugins/flatpak/flatpak.plugin.zsh
@@ -0,0 +1,26 @@
+#
+# Flatpak
+#
+
+# Manage installed applications and runtimes
+alias flatin='flatpak install'
+alias flatup='flatpak update'
+alias flatun='flatpak uninstall'
+alias flatls='flatpak list'
+
+alias flatpin='flatpak pin'
+alias flatinf='flatpak info'
+alias flatrep='flatpak repair'
+alias flathis='flatpak history'
+alias flatcfg='flatpak config'
+alias flatbak='flatpak create-usb'
+
+alias flatmask='flatpak mask'
+
+# Find applications and runtimes
+alias flatfind='flatpak search'
+
+# Manage running applications
+alias flatrun='flatpak run'
+alias flatps='flatpak ps'
+alias flatkill='flatpak kill'