diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 41b60773a70b..bb8fa48105ac 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -71,6 +71,7 @@
   ./programs/kbdlight.nix
   ./programs/light.nix
   ./programs/man.nix
+  ./programs/mosh.nix
   ./programs/nano.nix
   ./programs/screen.nix
   ./programs/shadow.nix
diff --git a/nixos/modules/programs/mosh.nix b/nixos/modules/programs/mosh.nix
new file mode 100644
index 000000000000..b478f8e180fa
--- /dev/null
+++ b/nixos/modules/programs/mosh.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg  = config.programs.mosh;
+
+in
+{
+  options.programs.mosh = {
+      enable = mkOption {
+	description = ''
+	  Whether to enable mosh. Note, this will open ports in your firewall!
+	'';
+        default = false;
+	example = true;
+	type = lib.types.bool;
+      };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [ mosh ];
+    networking.firewall.allowedUDPPortRanges = [ { from = 60000; to = 61000; } ];
+  };
+}