diff --git a/tomoyo-tools/tomoyo-auditd-log/consumer-for b/tomoyo-tools/tomoyo-auditd-log/consumer-for
deleted file mode 100644
index 1eb4b9b..0000000
--- a/tomoyo-tools/tomoyo-auditd-log/consumer-for
+++ /dev/null
@@ -1 +0,0 @@
-tomoyo-auditd-srv
diff --git a/tomoyo-tools/tomoyo-auditd-log/notification-fd b/tomoyo-tools/tomoyo-auditd-log/notification-fd
deleted file mode 100644
index 00750ed..0000000
--- a/tomoyo-tools/tomoyo-auditd-log/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/tomoyo-tools/tomoyo-auditd-log/pipeline-name b/tomoyo-tools/tomoyo-auditd-log/pipeline-name
deleted file mode 100644
index f3154aa..0000000
--- a/tomoyo-tools/tomoyo-auditd-log/pipeline-name
+++ /dev/null
@@ -1 +0,0 @@
-tomoyo-auditd
diff --git a/tomoyo-tools/tomoyo-auditd-log/run b/tomoyo-tools/tomoyo-auditd-log/run
deleted file mode 100644
index 697488d..0000000
--- a/tomoyo-tools/tomoyo-auditd-log/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/execlineb -P
-envfile /etc/s6/config/tomoyo-auditd.conf
-importas -sCuD "n3 s2000000 T" DIRECTIVES DIRECTIVES
-ifelse { test -w /var/log } {
-	foreground { install -d -o s6log -g s6log /var/log/tomoyo-auditd }
-	s6-setuidgid s6log exec -c s6-log -d3 -b -- ${DIRECTIVES} /var/log/tomoyo-auditd
-}
-foreground { install -d -o s6log -g s6log /run/log/tomoyo-auditd }
-s6-setuidgid s6log exec -c s6-log -d3 -b -- ${DIRECTIVES} /run/log/tomoyo-auditd
diff --git a/tomoyo-tools/tomoyo-auditd-log/type b/tomoyo-tools/tomoyo-auditd-log/type
deleted file mode 100644
index 5883cff..0000000
--- a/tomoyo-tools/tomoyo-auditd-log/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
diff --git a/tomoyo-tools/tomoyo-auditd-srv/producer-for b/tomoyo-tools/tomoyo-auditd-srv/producer-for
deleted file mode 100644
index 9194e28..0000000
--- a/tomoyo-tools/tomoyo-auditd-srv/producer-for
+++ /dev/null
@@ -1 +0,0 @@
-tomoyo-auditd-log
diff --git a/tomoyo-tools/tomoyo-auditd-srv/type b/tomoyo-tools/tomoyo-auditd-srv/type
deleted file mode 100644
index 5883cff..0000000
--- a/tomoyo-tools/tomoyo-auditd-srv/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
diff --git a/tomoyo-tools/tomoyo-auditd.conf b/tomoyo-tools/tomoyo-auditd.conf
index b99be80..e83f179 100644
--- a/tomoyo-tools/tomoyo-auditd.conf
+++ b/tomoyo-tools/tomoyo-auditd.conf
@@ -1,7 +1,5 @@
-# Retrieve logs from a remote system (e.g. REMOTE="remote_ip:remote_port")
-# Additonal options must still be configured in /etc/tomoyo/tools/auditd.conf
-# See TOMOYO-AUDITD(8)
+# Retrieve logs from a remote system (e.g. REMOTE="remote_ip:remote_port").
+# Note that tomoyo-auditd still requires that we configure audit logs in
+# /etc/tomoyo/tools/auditd.conf, see TOMOYO-AUDITD(8) or
+# https://tomoyo.osdn.jp.
 REMOTE=""
-
-# This configures the directives used for s6-log in the log service.
-DIRECTIVES="n3 s2000000 T"
diff --git a/tomoyo-tools/type b/tomoyo-tools/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/tomoyo-tools/type
@@ -0,0 +1 @@
+oneshot
diff --git a/tomoyo-tools/tomoyo-auditd-srv/run b/tomoyo-tools/up
similarity index 66%
rename from tomoyo-tools/tomoyo-auditd-srv/run
rename to tomoyo-tools/up
index 1c5ac90..1ba7fde 100644
--- a/tomoyo-tools/tomoyo-auditd-srv/run
+++ b/tomoyo-tools/up
@@ -1,5 +1,4 @@
 #!/bin/execlineb -P
 envfile /etc/s6/config/tomoyo-auditd.conf
-importas -sCuD "" REMOTE REMOTE
-fdmove -c 2 1
+importas -uD "" REMOTE REMOTE
 exec tomoyo-auditd ${REMOTE}