diff --git a/modules/s6/default.nix b/modules/s6/default.nix
index f23edec..53d7968 100644
--- a/modules/s6/default.nix
+++ b/modules/s6/default.nix
@@ -7,10 +7,27 @@ let
     s6-linux-init
     stdenvNoCC;
   inherit (lib.lists) unique concatMap;
+  inherit (lib) concatStrings;
+  inherit (builtins) map;
   inherit (pkgs.pseudofile) dir symlink;
   inherit (pkgs.liminix.services) oneshot bundle longrun;
   inherit (lib) mkIf mkEnableOption mkOption types;
   cfg = config.logging;
+
+  logger =
+    let pipecmds =
+          ["${s6}/bin/s6-log -bpd3 -- ${cfg.script} 1"] ++
+          (lib.optional cfg.persistent.enable
+            "/bin/tee /dev/pmsg0") ++
+          (lib.optional cfg.shipping.enable
+            "${pkgs.logshipper}/bin/logtap ${cfg.shipping.socket} logshipper-socket-event");
+    in ''
+      #!${execline}/bin/execlineb -P
+      ${execline}/bin/redirfd -w 1 /dev/null
+      ${execline}/bin/redirfd -rnb 0 fifo
+      ${concatStrings (map (l: "pipeline { ${l} }\n") pipecmds)}
+      ${s6}/bin/s6-log -- ${cfg.directory}
+    '';
   s6-rc-db =
     let
       # In the default bundle we need to have all the services
@@ -106,21 +123,7 @@ let
         mode = "0600";
       };
       notification-fd = { file = "3"; };
-      run = {
-        file = ''
-              #!${execline}/bin/execlineb -P
-              ${execline}/bin/redirfd -w 1 /dev/null
-              ${execline}/bin/redirfd -rnb 0 fifo
-              ${if cfg.shipping.enable then ''
-                pipeline { ${s6}/bin/s6-log -bpd3 -- ${cfg.script} 1 }
-                pipeline { ${pkgs.logshipper}/bin/logtap ${cfg.shipping.socket} logshipper-socket-event }
-                ${s6}/bin/s6-log -- ${cfg.directory}
-              '' else ''
-                ${s6}/bin/s6-log -bpd3 -- ${cfg.script} ${cfg.directory}
-              ''}
-          '';
-        mode = "0755";
-      };
+      run = { file = logger; mode = "0755"; };
     };
     getty = dir {
       run = {