diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index dd6c6b13881e..dca85cff138c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14308,6 +14308,17 @@
     githubId = 55911173;
     name = "Gwendolyn Quasebarth";
   };
+  lajp = {
+    email = "lajp@iki.fi";
+    github = "lajp";
+    githubId = 31856315;
+    name = "Luukas Pörtfors";
+    keys = [
+      {
+        fingerprint = "24E8 E4CC 0295 F4ED B9E0  B4A6 C913 9B8D EA65 BD82";
+      }
+    ];
+  };
   lamarios = {
     matrix = "@lamarios:matrix.org";
     github = "lamarios";
diff --git a/pkgs/by-name/vo/voikko-fi/package.nix b/pkgs/by-name/vo/voikko-fi/package.nix
new file mode 100644
index 000000000000..c51ccaae5d83
--- /dev/null
+++ b/pkgs/by-name/vo/voikko-fi/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenvNoCC,
+  python3,
+  foma,
+  libvoikko,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "voikko-fi";
+  version = "2.5";
+
+  src = fetchFromGitHub {
+    owner = "voikko";
+    repo = "corevoikko";
+    tag = "rel-voikko-fi-${finalAttrs.version}";
+    hash = "sha256-0MIQ54dCxyAfdgYWmmTVF+Yfa15K2sjJyP1JNxwHP2M=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/voikko-fi";
+
+  enableParallelBuilding = true;
+
+  installTargets = "vvfst-install DESTDIR=$(out)/share/voikko-fi";
+
+  nativeBuildInputs = [
+    python3
+    foma
+    libvoikko
+  ];
+
+  meta = {
+    homepage = "https://voikko.puimula.org";
+    description = "Description of Finnish morphology written for libvoikko";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ lajp ];
+    platforms = lib.platforms.unix;
+  };
+})