diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 53c99e3dda6..3f534813908 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10776,6 +10776,12 @@
     githubId = 15930073;
     name = "Moritz Scheuren";
   };
+  ovlach = {
+    email = "ondrej@vlach.xyz";
+    name = "Ondrej Vlach";
+    github = "ovlach";
+    githubId = 4405107;
+  };
   ozkutuk = {
     email = "ozkutuk@protonmail.com";
     github = "ozkutuk";
diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix
index a48bd4ae44d..a45fc62cf1f 100644
--- a/pkgs/applications/networking/datovka/default.nix
+++ b/pkgs/applications/networking/datovka/default.nix
@@ -2,30 +2,31 @@
 , mkDerivation
 , fetchurl
 , libxml2
-, libisds
+, libdatovka
 , qmake
 , qtbase
+, qtwebsockets
 , qtsvg
 , pkg-config
 }:
 
 mkDerivation rec {
   pname = "datovka";
-  version = "4.15.6";
+  version = "4.21.1";
 
   src = fetchurl {
-    url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz";
-    sha256 = "1qs1yd9qqsf56jm9w6sffkqb2l8s3i9qgi2q8vd59ss19ym6yky2";
+    url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";
+    sha256 = "sha256-mzCtZE4mira/ZeyfujBh+cONq1YbCyLIypiIX0kTVJg=";
   };
 
-  buildInputs = [ libisds qmake qtbase qtsvg libxml2 ];
+  buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ];
 
   nativeBuildInputs = [ pkg-config ];
 
   meta = with lib; {
     description = "Client application for operating Czech government-provided Databox infomation system";
     homepage = "https://www.datovka.cz/";
-    license = licenses.lgpl3;
+    license = licenses.gpl3Plus;
     maintainers = [ maintainers.mmahut ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/libdatovka/default.nix b/pkgs/development/libraries/libdatovka/default.nix
new file mode 100644
index 00000000000..aca25f73edd
--- /dev/null
+++ b/pkgs/development/libraries/libdatovka/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, stdenv
+, autoreconfHook
+, pkg-config
+, fetchurl
+, expat
+, gpgme
+, libgcrypt
+, libxml2
+, libxslt
+, gnutls
+, curl
+, docbook_xsl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libdatovka";
+  version = "0.2.1";
+
+  src = fetchurl {
+    url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz";
+    sha256 = "sha256-687d8ZD9zfMeo62YWCW5Kc0CXkKClxtbbwXR51pPwBE=";
+  };
+
+  patches = [
+    ./libdatovka-deprecated-fn-curl.patch
+  ];
+
+  configureFlags = [
+    "--with-docbook-xsl-stylesheets=${docbook_xsl}/xml/xsl/docbook"
+  ];
+
+  buildInputs = [ pkg-config autoreconfHook expat gpgme libgcrypt libxml2 libxslt gnutls curl docbook_xsl ];
+
+  meta = with lib; {
+    description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system";
+    homepage = "https://gitlab.nic.cz/datovka/libdatovka";
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.ovlach ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch b/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch
new file mode 100644
index 00000000000..b63f850c7d7
--- /dev/null
+++ b/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch
@@ -0,0 +1,11 @@
+--- libdatovka-v0.2.1/configure.ac	2021-11-03 13:33:03.000000000 +0100
++++ libdatovka-v0.2.1-patched/configure.ac	2023-01-18 11:44:25.647566474 +0100
+@@ -46,6 +46,8 @@
+                 [Define if you want include debugging code])
+       )
+ 
++CFLAGS="${CFLAGS} -Wno-error=deprecated-declarations"
++
+ AC_CHECK_DECL([_WIN32])
+ AM_CONDITIONAL([WIN32], [test "$ac_cv_have_decl__WIN32" = "yes"])
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98cd30736fa..354fa60ea1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20604,6 +20604,8 @@ with pkgs;
 
   libdaemon = callPackage ../development/libraries/libdaemon { };
 
+  libdatovka = callPackage ../development/libraries/libdatovka { };
+
   libdatrie = callPackage ../development/libraries/libdatrie { };
 
   libdazzle = callPackage ../development/libraries/libdazzle { };