diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d28952850686..6cea23ca0c44 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3823,6 +3823,12 @@
     github = "CHN-beta";
     githubId = 35858462;
   };
+  cholli = {
+    email = "christoph.hollizeck@hey.com";
+    github = "Daholli";
+    githubId = 25060097;
+    name = "Christoph Hollizeck";
+  };
   choochootrain = {
     email = "hurshal@imap.cc";
     github = "choochootrain";
diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix
new file mode 100644
index 000000000000..f056ee9e99a0
--- /dev/null
+++ b/pkgs/by-name/py/pyfa/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  appimageTools,
+  fetchurl,
+}:
+let
+  version = "2.60.1";
+in
+appimageTools.wrapType2 {
+  inherit version;
+  pname = "pyfa";
+
+  src = fetchurl {
+    name = "pyfa-appimage-${version}";
+    url = "https://github.com/pyfa-org/Pyfa/releases/download/v${version}/pyfa-v${version}-linux.AppImage";
+    hash = "sha256-+nyIG6pweIgC6ZiWJaO4E2Fp0/zP+DhQrUWzHnIBQXk=";
+  };
+
+  meta = {
+    description = "Python fitting assistant, cross-platform fitting tool for EVE Online";
+    homepage = "https://github.com/pyfa-org/Pyfa";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      toasteruwu
+      cholli
+    ];
+    mainProgram = "pyfa";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = lib.platforms.linux;
+  };
+}