diff --git a/services.nix b/services.nix
index 5d156c8..216c948 100644
--- a/services.nix
+++ b/services.nix
@@ -29,6 +29,7 @@ in
     riot = { ip = "127.0.0.1"; port = riot_port; auth = false; };
     matrix = { ip = "127.0.0.1"; port = 8008; auth = false; };
     organizr = { ip = "127.0.0.1"; port = organizr_port; auth = true; };
+    calibre = { ip = "127.0.0.1"; port = 8080; auth = false; };
   };
 
   services.mailserver.enable = true;
@@ -189,6 +190,12 @@ in
     '';
   };
 
+  services.calibre-server.enable = true;
+  services.calibre-server.libraryDir = "/var/lib/calibre";
+  users.extraUsers.calibre-server = {
+    home = "/var/lib/calibre";
+  };
+
   networking.firewall.allowedTCPPorts = [
     111 2049 4000 4001 4002 # NFS
     3483 9000 9090 # Slimserver