diff --git a/doc/aa-chroot.pod b/doc/aa-chroot.pod
index 89686a3..6691166 100644
--- a/doc/aa-chroot.pod
+++ b/doc/aa-chroot.pod
@@ -17,6 +17,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-h, --help>
 
 Show help screen and exit.
diff --git a/doc/aa-ctty.pod b/doc/aa-ctty.pod
index b68225c..66ecbbf 100644
--- a/doc/aa-ctty.pod
+++ b/doc/aa-ctty.pod
@@ -17,6 +17,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-f, --fd> I<FD>
 
 Use file descriptor I<FD> as terminal; Defaults to stdin (0).
diff --git a/doc/aa-echo.pod b/doc/aa-echo.pod
index ebd9084..51fc91d 100644
--- a/doc/aa-echo.pod
+++ b/doc/aa-echo.pod
@@ -22,6 +22,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-e, --error>
 
 Show I<MESSAGE...> as an error message. A red prefix "==> ERROR: " will be
diff --git a/doc/aa-enable.pod b/doc/aa-enable.pod
index 85d89d3..8f0914d 100644
--- a/doc/aa-enable.pod
+++ b/doc/aa-enable.pod
@@ -35,6 +35,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-f, --set-finish> I<FINISH>
 
 Create a symlink I<REPODIR/.scandir/.s6-svscan/finish> that points to I<FINISH>.
diff --git a/doc/aa-hiercopy.pod b/doc/aa-hiercopy.pod
index f072ee0..f62dabe 100644
--- a/doc/aa-hiercopy.pod
+++ b/doc/aa-hiercopy.pod
@@ -17,6 +17,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-h, --help>
 
 Show help screen and exit.
diff --git a/doc/aa-incmdline.pod b/doc/aa-incmdline.pod
index 160ea3d..6453066 100644
--- a/doc/aa-incmdline.pod
+++ b/doc/aa-incmdline.pod
@@ -17,6 +17,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-f, --file> I<FILE>
 
 Read command line from I<FILE> instead of I</proc/cmdline>
diff --git a/doc/aa-kill.pod b/doc/aa-kill.pod
index 7f25ad5..6e3a6ef 100644
--- a/doc/aa-kill.pod
+++ b/doc/aa-kill.pod
@@ -17,6 +17,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-h, --help>
 
 Show help screen and exit.
diff --git a/doc/aa-mount.pod b/doc/aa-mount.pod
index 43de412..d1a3afe 100644
--- a/doc/aa-mount.pod
+++ b/doc/aa-mount.pod
@@ -27,6 +27,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-d, --mkdir>
 
 Create directory I<MOUNTPOINT> before doing the mount. Note that this only tries
diff --git a/doc/aa-pivot.pod b/doc/aa-pivot.pod
index 48c3638..1b26a50 100644
--- a/doc/aa-pivot.pod
+++ b/doc/aa-pivot.pod
@@ -17,6 +17,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-h, --help>
 
 Show help screen and exit.
diff --git a/doc/aa-reboot.pod b/doc/aa-reboot.pod
index 8d8621a..3907d3a 100644
--- a/doc/aa-reboot.pod
+++ b/doc/aa-reboot.pod
@@ -17,6 +17,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-H, --halt>
 
 Halts the machine.
diff --git a/doc/aa-reset.pod b/doc/aa-reset.pod
index 95e5d9c..3604969 100644
--- a/doc/aa-reset.pod
+++ b/doc/aa-reset.pod
@@ -26,6 +26,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-h, --help>
 
 Show help screen and exit.
diff --git a/doc/aa-service.pod b/doc/aa-service.pod
index d9887bc..af36545 100644
--- a/doc/aa-service.pod
+++ b/doc/aa-service.pod
@@ -17,6 +17,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-h, --help>
 
 Show help screen and exit.
diff --git a/doc/aa-setready.pod b/doc/aa-setready.pod
index bafa184..583e88b 100644
--- a/doc/aa-setready.pod
+++ b/doc/aa-setready.pod
@@ -17,6 +17,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-h, --help>
 
 Show help screen and exit.
diff --git a/doc/aa-start.pod b/doc/aa-start.pod
index 7fea9cd..46b8ac5 100644
--- a/doc/aa-start.pod
+++ b/doc/aa-start.pod
@@ -18,6 +18,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-h, --help>
 
 Show help screen and exit.
diff --git a/doc/aa-status.pod b/doc/aa-status.pod
index b559e9d..4711141 100644
--- a/doc/aa-status.pod
+++ b/doc/aa-status.pod
@@ -24,6 +24,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-f, --filter> I<filter>
 
 Only process services matching I<filter>. See L<B<FILTERING>|/FILTERING> below
diff --git a/doc/aa-stop.pod b/doc/aa-stop.pod
index bea65a0..9b7305e 100644
--- a/doc/aa-stop.pod
+++ b/doc/aa-stop.pod
@@ -29,6 +29,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-h, --help>
 
 Show help screen and exit.
diff --git a/doc/aa-terminate.pod b/doc/aa-terminate.pod
index 8c7cfef..5150b4c 100644
--- a/doc/aa-terminate.pod
+++ b/doc/aa-terminate.pod
@@ -22,6 +22,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-h, --help>
 
 Show help screen and exit.
diff --git a/doc/aa-test.pod b/doc/aa-test.pod
index 179a3b7..d4bdcc9 100644
--- a/doc/aa-test.pod
+++ b/doc/aa-test.pod
@@ -22,6 +22,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-d, --directory>
 
 Test whether I<FILE> exists and is a directory
diff --git a/doc/aa-tty.pod b/doc/aa-tty.pod
index 1097407..464e446 100644
--- a/doc/aa-tty.pod
+++ b/doc/aa-tty.pod
@@ -17,6 +17,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-h, --help>
 
 Show help screen and exit.
diff --git a/doc/aa-umount.pod b/doc/aa-umount.pod
index d9d036f..4af56db 100644
--- a/doc/aa-umount.pod
+++ b/doc/aa-umount.pod
@@ -17,6 +17,9 @@ stderr for warnings and errors, everything is sent both to stdout and stderr.
 This is intended to redirect stderr to a log file, so full output can be both
 shown on console and logged.
 
+B<Deprecation warning:> Note that this option has been deprecated and will be
+removed in the next version; You should use B<--log-file> instead.
+
 =item B<-f, --force>
 
 Force unmount even if busy (only for NFS mounts). This can cause data loss.
diff --git a/src/libanopa/output.c b/src/libanopa/output.c
index fb8cc06..aaaa9e7 100644
--- a/src/libanopa/output.c
+++ b/src/libanopa/output.c
@@ -53,6 +53,7 @@ chk_tty (void)
 void
 aa_set_double_output (int enabled)
 {
+    aa_strerr_warn1x ("--double-output has been deprecated, see to use --log-file instead");
     double_output = !!enabled;
 }