diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix
index 7e2f779cc49b..facab88c2908 100644
--- a/lib/licenses/licenses.nix
+++ b/lib/licenses/licenses.nix
@@ -925,6 +925,11 @@ lib.mapAttrs mkLicense (
       redistributable = true;
     };
 
+    fsfap = {
+      spdxId = "FSFAP";
+      fullName = "FSF All Permissive License";
+    };
+
     hl3 = {
       fullName = "Hippocratic License v3.0";
       url = "https://firstdonoharm.dev/version/3/0/core.txt";
diff --git a/pkgs/by-name/ka/karp/package.nix b/pkgs/by-name/ka/karp/package.nix
index 1a3af7a0087f..aa14648060a0 100644
--- a/pkgs/by-name/ka/karp/package.nix
+++ b/pkgs/by-name/ka/karp/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
       bsd3
       cc-by-sa-40
       cc0
-      # FSFAP
+      fsfap
       gpl2Only
       gpl3Only
       lgpl2Plus
diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix
index a43a4548a391..1c53a4a45af3 100644
--- a/pkgs/kde/lib/mk-kde-derivation.nix
+++ b/pkgs/kde/lib/mk-kde-derivation.nix
@@ -35,11 +35,6 @@ let
       # https://invent.kde.org/kdevelop/kdevelop/-/blob/master/LICENSES/LicenseRef-MIT-KDevelop-Ideal.txt
       "LicenseRef-MIT-KDevelop-Ideal" = lib.licenses.mit;
 
-      "FSFAP" = {
-        spdxId = "FSFAP";
-        fullName = "FSF All Permissive License";
-      };
-
       "FSFULLR" = {
         spdxId = "FSFULLR";
         fullName = "FSF Unlimited License (with License Retention)";
diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix
index 51c2718ed61b..178e549fb347 100644
--- a/pkgs/kde/misc/klevernotes/default.nix
+++ b/pkgs/kde/misc/klevernotes/default.nix
@@ -27,7 +27,7 @@ mkKdeDerivation rec {
     bsd3
     cc-by-sa-40
     cc0
-    # TODO: add FSFAP license
+    fsfap
     gpl2Plus
     gpl3Only
     gpl3Plus