diff --git a/modules/nixos/services/mosh/default.nix b/modules/nixos/services/mosh/default.nix
new file mode 100644
index 0000000..59b7037
--- /dev/null
+++ b/modules/nixos/services/mosh/default.nix
@@ -0,0 +1,18 @@
+{ config, lib, namespace, ... }:
+let
+  inherit (lib) mkIf;
+
+  cfg = config.${namespace}.services.mosh;
+in
+{
+  options.${namespace}.services.mosh = {
+    enable = lib.mkEnableOption "mosh support";
+  };
+
+  config = mkIf cfg.enable {
+    programs.mosh = {
+      enable = true;
+      openFirewall = true;
+    };
+  };
+}
diff --git a/systems/x86_64-linux/lin-va-terminal/default.nix b/systems/x86_64-linux/lin-va-terminal/default.nix
index 8697b11..c3e29cf 100755
--- a/systems/x86_64-linux/lin-va-terminal/default.nix
+++ b/systems/x86_64-linux/lin-va-terminal/default.nix
@@ -32,8 +32,9 @@ in
     };
 
     services = {
-      openssh = enabled;
       avahi = enabled;
+      mosh = enabled;
+      openssh = enabled;
     };
 
     virtualisation = {