diff --git a/apps/update-sources/src/app.ts b/apps/update-sources/src/app.ts
index 40a7cf7a..055376aa 100644
--- a/apps/update-sources/src/app.ts
+++ b/apps/update-sources/src/app.ts
@@ -42,6 +42,10 @@ const main = async() => {
         console.log(updateFirefoxAddons());
     }
 
+    if (args['fcft']) {
+        console.log(runNixUpdate('fcft'));
+    }
+
     if (args['h'] || args['homepage']) {
         console.log(runNixUpdate('homepage'));
     }
@@ -129,6 +133,7 @@ const main = async() => {
             console.log(execution.stdout);
         };
 
+        updatePackage('fcft');
         updatePackage('homepage');
         updatePackage('jmusicbot');
         updatePackage('pam-fprint-grosshack');
diff --git a/modules/base/packages/default.nix b/modules/base/packages/default.nix
index 94b9501a..a7a8dd2e 100644
--- a/modules/base/packages/default.nix
+++ b/modules/base/packages/default.nix
@@ -18,6 +18,11 @@ in {
         "nurl"
         "nixpkgs-wayland"
       ])
+      ++ [
+        (final: prev: {
+          inherit (pkgs.selfPackages) fcft;
+        })
+      ]
       ++ (attrValues {
         # inherit
         #   (self.overlays)
diff --git a/overlays/misc-fixes/default.nix b/overlays/misc-fixes/default.nix
index f9ea6839..90a58a79 100644
--- a/overlays/misc-fixes/default.nix
+++ b/overlays/misc-fixes/default.nix
@@ -8,17 +8,4 @@ final: prev: {
       hash = "sha256-ukapzy0+mS4rorX3D22lRKX/D9TXmkq8W2YNDQIq7A8=";
     };
   });
-
-  # FIXME: automate this or make PR for nixpkgs-wayland?
-  fcft = prev.fcft.overrideAttrs (o: rec {
-    version = "3.3.0";
-
-    src = prev.fetchFromGitea {
-      domain = "codeberg.org";
-      owner = "dnkl";
-      repo = "fcft";
-      rev = version;
-      hash = "sha256-spK75cT6x0rHcJT2YxX1e39jvx4uQKL/b4CHO7bon4s=";
-    };
-  });
 }
diff --git a/packages/default.nix b/packages/default.nix
index 0e957bad..febbd668 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -6,6 +6,8 @@
   selfPackages = {
     coloryou = final.callPackage ./coloryou {};
 
+    fcft = final.callPackage ./fcft {};
+
     gpu-screen-recorder = final.callPackage ./gpu-screen-recorder/gpu-screen-recorder.nix {
       inherit (inputs) gpu-screen-recorder-src;
     };
diff --git a/packages/fcft/default.nix b/packages/fcft/default.nix
new file mode 100644
index 00000000..0cc5cd8e
--- /dev/null
+++ b/packages/fcft/default.nix
@@ -0,0 +1,16 @@
+{
+  fcft,
+  fetchFromGitea,
+  ...
+}:
+fcft.overrideAttrs (o: rec {
+  version = "3.3.0";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "dnkl";
+    repo = o.pname;
+    rev = version;
+    hash = "sha256-spK75cT6x0rHcJT2YxX1e39jvx4uQKL/b4CHO7bon4s=";
+  };
+})