diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b64c236bde35..ff513d5976fc 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -291,6 +291,7 @@
   vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
   vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>";
   vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";
+  wedens = "wedens <kirill.wedens@gmail.com>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
   wjlroe = "William Roe <willroe@gmail.com>";
diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix
new file mode 100644
index 000000000000..595f989ff4e8
--- /dev/null
+++ b/pkgs/applications/window-managers/kbdd/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, pkgconfig, dbus_glib, autoreconfHook, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "kbdd";
+
+  src = fetchgit {
+    url = https://github.com/qnikst/kbdd;
+    rev = "47dee0232f157cd865e43d92005a2ba107f6fd75";
+    sha256 = "1b9a66d216326a9759cad26393fbf8259fe7a0c2dd1075047fc989f0e52d969f";
+  };
+
+  buildInputs = [ pkgconfig xorg.libX11 dbus_glib autoreconfHook ];
+
+  meta = {
+    description = "Simple daemon and library to make per window layout using XKB";
+    homepage = https://github.com/qnikst/kbdd;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.wedens ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b359c8b21c6c..f8ab5ddda2f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1967,6 +1967,8 @@ let
 
   kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { };
 
+  kbdd = callPackage ../applications/window-managers/kbdd { };
+
   kdbplus = callPackage_i686 ../applications/misc/kdbplus { };
 
   keepalived = callPackage ../tools/networking/keepalived { };