diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 3c7a399623d5..5e55b64ffa9f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -18,6 +18,7 @@
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
   bodil = "Bodil Stokke <nix@bodil.org>";
+  calrama = "Moritz Maxeiner <moritz@ucworks.org>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
diff --git a/pkgs/applications/misc/ykpers/default.nix b/pkgs/applications/misc/ykpers/default.nix
index 70ec351f71b7..e7bfa8ded50e 100644
--- a/pkgs/applications/misc/ykpers/default.nix
+++ b/pkgs/applications/misc/ykpers/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec
   src = fetchurl
   {
     url = "http://opensource.yubico.com/yubikey-personalization/releases/${name}.tar.gz";
-	sha256 = "1n4s8kk31q5zh2rm7sj9qmv86yl8ibimdnpvk9ny391a88qlypyd";
+    sha256 = "1n4s8kk31q5zh2rm7sj9qmv86yl8ibimdnpvk9ny391a88qlypyd";
   };
 
   buildInputs = [pkgconfig libusb1 libyubikey];
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec
   meta =
   {
     homepage = "http://opensource.yubico.com/yubikey-personalization/";
-	description = "YubiKey Personalization cross-platform library and tool";
-	license = "bsd";
+    description = "YubiKey Personalization cross-platform library and tool";
+    license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.calrama ];
   };
 }
diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix
index 77bf60c4255e..25c2117b059d 100644
--- a/pkgs/development/libraries/libyubikey/default.nix
+++ b/pkgs/development/libraries/libyubikey/default.nix
@@ -8,13 +8,14 @@ stdenv.mkDerivation rec
   src = fetchurl
   {
     url = "http://opensource.yubico.com/yubico-c/releases/${name}.tar.gz";
-	sha256 = "19pm4rqsnm9r0n5j26bqkxa1jpimdavzcvg5g7p416vkjhxc6lw9";
+    sha256 = "19pm4rqsnm9r0n5j26bqkxa1jpimdavzcvg5g7p416vkjhxc6lw9";
   };
 
   meta =
   {
     homepage = "http://opensource.yubico.com/yubico-c/";
-	description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)";
-	license = "bsd";
+    description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)";
+    license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.calrama ];
   };
 }