diff --git a/config/fudo/minecraft-server.nix b/config/fudo/minecraft-server.nix
index 06f9c67..9ee5474 100644
--- a/config/fudo/minecraft-server.nix
+++ b/config/fudo/minecraft-server.nix
@@ -43,6 +43,10 @@ in {
   };
 
   config = mkIf cfg.enable {
+    environment.systemPackages = [
+      cfg.package
+    ];
+
     services.minecraft-server = {
       enable = true;
       package = cfg.package;
diff --git a/hosts/france.nix b/hosts/france.nix
index 2fc57a7..17905fc 100644
--- a/hosts/france.nix
+++ b/hosts/france.nix
@@ -270,8 +270,8 @@ in {
       "webmail.test.fudo.org" = {
         title = "Fudo Webmail";
         favicon = "/etc/nixos/static/fudo.org/favicon.ico";
-        mail-server = mail-hostname;
-        domain = "test.fudo.org";
+        mail-server = "mail.fudo.org";
+        domain = "fudo.org";
         edit-mode = "Plain";
         database = {
           name = "webmail";
@@ -284,8 +284,8 @@ in {
       "webmail.test.selby.ca" = {
         title = "Selby Webmail";
         favicon = "/etc/nixos/static/selby.ca/favicon.ico";
-        mail-server = mail-hostname;
-        domain = "test.selby.ca";
+        mail-server = "mail.selby.ca";
+        domain = "selby.ca";
         database = {
           name = "webmail";
           hostname = "localhost";
@@ -621,7 +621,7 @@ in {
 
   fudo.minecraft-server = {
     enable = true;
-    package = pkgs.minecraft-server_1_15_2;
+    package = pkgs.minecraft-server_1_16_1;
     data-dir = minecraft-data-dir;
     world-name = "selbyland";
     motd = "Welcome to the Selby Minecraft server.";
diff --git a/packages/local.nix b/packages/local.nix
index 1e6174c..60725a8 100644
--- a/packages/local.nix
+++ b/packages/local.nix
@@ -23,6 +23,19 @@
       };
     });
 
+    # DON'T LEAVE THE HASH--Nix will think the package hasn't changed
+    minecraft-server_1_16_1 = let
+      version = "1.16.1";
+      url = "https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar";
+      sha256 = "0nwkdig6yw4cnm2ld78z4j4xzhbm1rwv55vfxz0gzhsbf93xb0i7";
+    in (pkgs.minecraft-server.overrideAttrs (oldAttrs: rec {
+      name = "minecraft-server-${version}";
+      inherit version;
+      src = pkgs.fetchurl {
+        inherit url sha256;
+      };
+    }));
+
     postgresql_11_gssapi = pkgs.postgresql_11.overrideAttrs (oldAttrs: rec {
       configureFlags = oldAttrs.configureFlags ++ [ "--with-gssapi" ];
       buildInputs = oldAttrs.buildInputs ++ [ pkgs.krb5 ];