diff --git a/pkgs/development/python-modules/dawg-python/default.nix b/pkgs/development/python-modules/dawg-python/default.nix
index 997600122d01..eab79418b8b5 100644
--- a/pkgs/development/python-modules/dawg-python/default.nix
+++ b/pkgs/development/python-modules/dawg-python/default.nix
@@ -17,10 +17,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dawg_python" ];
 
-  meta = with lib; {
+  meta = {
     description = "Pure Python reader for DAWGs created by dawgdic C++ library or DAWG Python extension";
     homepage = "https://github.com/pytries/DAWG-Python";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dawg2-python/default.nix b/pkgs/development/python-modules/dawg2-python/default.nix
new file mode 100644
index 000000000000..9b3775b51a16
--- /dev/null
+++ b/pkgs/development/python-modules/dawg2-python/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
+  typing-extensions,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "dawg2-python";
+  version = "0.9.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pymorphy2-fork";
+    repo = "DAWG-Python";
+    tag = version;
+    hash = "sha256-45k7QmozbMt7qYdDFRSL5JDeEtqdMHBoEXXQkLDoGfE=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    typing-extensions
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "dawg_python"
+  ];
+
+  meta = {
+    description = "Pure-python reader for DAWGs created by dawgdic C++ library or DAWG Python extension. Fork of  https://github.com/pytries/DAWG-Python";
+    homepage = "https://github.com/pymorphy2-fork/DAWG-Python";
+    changelog = "https://github.com/pymorphy2-fork/DAWG-Python/blob/${src.tag}/CHANGES.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+}
diff --git a/pkgs/development/python-modules/pymorphy2/dicts-ru.nix b/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
similarity index 72%
rename from pkgs/development/python-modules/pymorphy2/dicts-ru.nix
rename to pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
index 2bab523c30c1..b273ef8eef7e 100644
--- a/pkgs/development/python-modules/pymorphy2/dicts-ru.nix
+++ b/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
@@ -2,24 +2,34 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+
+  # build-system
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pymorphy2-dicts-ru";
   version = "2.4.417127.4579844";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-eMrQOtymBQIavTh6Oy61FchRuG6UaCoe8jVKLHT8wZY=";
   };
 
+  build-system = [
+    setuptools
+  ];
+
+  # has no tests
+  doCheck = false;
+
   pythonImportsCheck = [ "pymorphy2_dicts_ru" ];
 
-  meta = with lib; {
+  meta = {
     description = "Russian dictionaries for pymorphy2";
     homepage = "https://github.com/kmike/pymorphy2-dicts/";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pymorphy3/dicts-ru.nix b/pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix
similarity index 75%
rename from pkgs/development/python-modules/pymorphy3/dicts-ru.nix
rename to pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix
index 83a91b0f6aae..c30e31b6efb8 100644
--- a/pkgs/development/python-modules/pymorphy3/dicts-ru.nix
+++ b/pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix
@@ -2,6 +2,9 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+
+  # build-system
+  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -14,15 +17,19 @@ buildPythonPackage rec {
     hash = "sha256-Oas3nUypBbr+1Q9a/Do95vlkNgV3b7yrxNMIjU7TgrA=";
   };
 
+  build-system = [
+    setuptools
+  ];
+
   # has no tests
   doCheck = false;
 
   pythonImportsCheck = [ "pymorphy3_dicts_ru" ];
 
-  meta = with lib; {
+  meta = {
     description = "Russian dictionaries for pymorphy3";
     homepage = "https://github.com/no-plagiarism/pymorphy3-dicts";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jboy ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jboy ];
   };
 }
diff --git a/pkgs/development/python-modules/pymorphy3/dicts-uk.nix b/pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix
similarity index 75%
rename from pkgs/development/python-modules/pymorphy3/dicts-uk.nix
rename to pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix
index 9a755f1559d7..0ce1254dfa37 100644
--- a/pkgs/development/python-modules/pymorphy3/dicts-uk.nix
+++ b/pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix
@@ -2,6 +2,9 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+
+  # build-system
+  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -14,15 +17,19 @@ buildPythonPackage rec {
     hash = "sha256-s5RaNBNuGTgGzeZXuicdiKYHYedRN8E9E4qNFCqNEqw=";
   };
 
+  build-system = [
+    setuptools
+  ];
+
   # has no tests
   doCheck = false;
 
   pythonImportsCheck = [ "pymorphy3_dicts_uk" ];
 
-  meta = with lib; {
+  meta = {
     description = "Ukrainian dictionaries for pymorphy3";
     homepage = "https://github.com/no-plagiarism/pymorphy3-dicts";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jboy ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jboy ];
   };
 }
diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix
index f44bd9a8f353..a2273ea72efa 100644
--- a/pkgs/development/python-modules/pymorphy3/default.nix
+++ b/pkgs/development/python-modules/pymorphy3/default.nix
@@ -2,44 +2,60 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  click,
-  dawg-python,
-  docopt,
-  pytestCheckHook,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  dawg2-python,
   pymorphy3-dicts-ru,
   pymorphy3-dicts-uk,
+
+  # tests
+  pytestCheckHook,
+  click,
 }:
 
 buildPythonPackage rec {
   pname = "pymorphy3";
-  version = "2.0.4";
-  format = "setuptools";
+  version = "2.0.6";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "no-plagiarism";
     repo = "pymorphy3";
     tag = version;
-    hash = "sha256-Ula2OQ80dcGeMlXauehXnlEkHLjjm4jZn39eFNltbEA=";
+    hash = "sha256-5s5v6+vMCeyn/73G5uUfRtTGkkqa7RNW8/r1v3Ay4us=";
   };
 
-  propagatedBuildInputs = [
-    dawg-python
-    docopt
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    dawg2-python
     pymorphy3-dicts-ru
     pymorphy3-dicts-uk
   ];
 
-  optional-dependencies.CLI = [ click ];
+  optional-dependencies = {
+    CLI = [
+      click
+    ];
+  };
 
-  nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.CLI;
+  nativeCheckInputs = [
+    pytestCheckHook
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "pymorphy3" ];
 
-  meta = with lib; {
+  meta = {
     description = "Morphological analyzer/inflection engine for Russian and Ukrainian";
     mainProgram = "pymorphy";
     homepage = "https://github.com/no-plagiarism/pymorphy3";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jboy ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jboy ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6b29a8c084d7..c8c34d8468f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3515,6 +3515,8 @@ self: super: with self; {
 
   dawg-python = callPackage ../development/python-modules/dawg-python { };
 
+  dawg2-python = callPackage ../development/python-modules/dawg2-python { };
+
   dazl = callPackage ../development/python-modules/dazl { };
 
   db-dtypes = callPackage ../development/python-modules/db-dtypes { };
@@ -13744,13 +13746,13 @@ self: super: with self; {
 
   pymorphy2 = callPackage ../development/python-modules/pymorphy2 { };
 
-  pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2/dicts-ru.nix { };
+  pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2-dicts-ru { };
 
   pymorphy3 = callPackage ../development/python-modules/pymorphy3 { };
 
-  pymorphy3-dicts-ru = callPackage ../development/python-modules/pymorphy3/dicts-ru.nix { };
+  pymorphy3-dicts-ru = callPackage ../development/python-modules/pymorphy3-dicts-ru { };
 
-  pymorphy3-dicts-uk = callPackage ../development/python-modules/pymorphy3/dicts-uk.nix { };
+  pymorphy3-dicts-uk = callPackage ../development/python-modules/pymorphy3-dicts-uk { };
 
   pympler = callPackage ../development/python-modules/pympler { };