diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 88c8f632f..aa3d4f73c 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -718,6 +718,13 @@ in
           A new module is available: 'services.mpd'.
         '';
       }
+
+      {
+        time = "2018-07-31T13:33:39+00:00";
+        message = ''
+          A new module is available: 'services.status-notifier-watcher'.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 323fe176a..982dab956 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -73,6 +73,7 @@ let
     ./services/redshift.nix
     ./services/screen-locker.nix
     ./services/stalonetray.nix
+    ./services/status-notifier-watcher.nix
     ./services/syncthing.nix
     ./services/taffybar.nix
     ./services/tahoe-lafs.nix
diff --git a/modules/services/status-notifier-watcher.nix b/modules/services/status-notifier-watcher.nix
new file mode 100644
index 000000000..08c668bf0
--- /dev/null
+++ b/modules/services/status-notifier-watcher.nix
@@ -0,0 +1,46 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.status-notifier-watcher;
+
+in
+
+{
+  meta.maintainers = [ maintainers.pltanton ];
+
+  options = {
+    services.status-notifier-watcher = {
+      enable = mkEnableOption "Status Notifier Watcher";
+
+      package = mkOption {
+        default = pkgs.haskellPackages.status-notifier-item;
+        defaultText = "pkgs.haskellPackages.status-notifier-item";
+        type = types.package;
+        example = literalExample "pkgs.haskellPackages.status-notifier-item";
+        description = "The package to use for the status notifier watcher binary.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.status-notifier-watcher = {
+        Unit = {
+          Description = "SNI watcher";
+          After = [ "graphical-session-pre.target" ];
+          PartOf = [ "graphical-session.target" ];
+          Before = [ "taffybar.service" ];
+        };
+
+        Service = {
+          ExecStart = "${cfg.package}/bin/status-notifier-watcher";
+        };
+
+        Install = {
+          WantedBy = [ "graphical-session.target" "taffybar.service" ];
+        };
+    };
+  };
+}