diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index f30935952c8a..8b14848bf1f0 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -28,6 +28,8 @@
 
 - [dsearch](https://github.com/AvengeMedia/danksearch), a fast filesystem search service with fuzzy matching. Available as [programs.dsearch](#opt-programs.dsearch.enable).
 
+- [Ente Auth](https://ente.io/auth/), an open source 2FA authenticator, with end-to-end encrypted backups. Available as [programs.ente-auth](#opt-programs.ente-auth.enable).
+
 - [udp-over-tcp](https://github.com/mullvad/udp-over-tcp), a tunnel for proxying UDP traffic over a TCP stream. Available as `services.udp-over-tcp`.
 
 - [Komodo Periphery](https://github.com/moghtech/komodo), a multi-server Docker and Git deployment agent by Komodo. Available as [services.komodo-periphery](#opt-services.komodo-periphery.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ed876450bac2..10823b360fa8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -204,6 +204,7 @@
   ./programs/dsearch.nix
   ./programs/dublin-traceroute.nix
   ./programs/ecryptfs.nix
+  ./programs/ente-auth.nix
   ./programs/environment.nix
   ./programs/envision.nix
   ./programs/evince.nix
diff --git a/nixos/modules/programs/ente-auth.nix b/nixos/modules/programs/ente-auth.nix
new file mode 100644
index 000000000000..18a82fe686a1
--- /dev/null
+++ b/nixos/modules/programs/ente-auth.nix
@@ -0,0 +1,27 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.programs.ente-auth;
+in
+{
+  options.programs.ente-auth = {
+    enable = lib.mkEnableOption "Ente Auth";
+    package = lib.mkPackageOption pkgs "ente-auth" { };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+    services.gnome.gnome-keyring.enable = lib.mkIf (
+      !config.services.desktopManager.plasma6.enable
+    ) true;
+  };
+
+  meta.maintainers = with lib.maintainers; [
+    gepbird
+    yiyu
+  ];
+}