diff --git a/dovecot.nix b/dovecot.nix
index 1b72ca1..424f432 100644
--- a/dovecot.nix
+++ b/dovecot.nix
@@ -6,6 +6,11 @@ let
 
   sieveDirectory = "${cfg.state-directory}/sieves";
 
+  dovecotPkg = pkgs.dovecot.overrideAttrs (oldAttrs: {
+    configureFlags = oldAttrs.configureFlags ++ [ "--with-solr" ];
+    buildInputs = oldAttrs.buildInputs ++ [ pkgs.expat ];
+  });
+
 in {
   options.fudo.mail.dovecot = with types; {
     enable = mkEnableOption "Enable Dovecot2 IMAP server.";