diff --git a/adho-configuration.nix b/adho-configuration.nix
index 7a4efc149..12b858086 100644
--- a/adho-configuration.nix
+++ b/adho-configuration.nix
@@ -13,6 +13,15 @@
   services.avahi.enable     = true;
   services.avahi.nssmdns    = true;
 
+  # Yubikey related:
+  services.pcscd.enable = true;
+  environment.systemPackages = with pkgs; [
+    cfssl
+    libp11
+    opensc
+    yubico-piv-tool
+  ];
+
   networking = {
     hostName = "adho";
     wireless.enable = true;