diff --git a/audio.c b/audio.c
index d0bcf9880..df5f8825f 100644
--- a/audio.c
+++ b/audio.c
@@ -64,4 +64,10 @@ void audio_ls_outputs(void) {
     printf("Available audio outputs:\n");
     for (out=outputs; *out; out++)
         printf("    %s%s\n", (*out)->name, out==outputs ? " (default)" : "");
+    
+    for (out=outputs; *out; out++) {
+        printf("\n");
+        printf("Options for output %s:\n", (*out)->name);
+        (*out)->help();
+    }
 }
diff --git a/audio_dummy.c b/audio_dummy.c
index 67245267d..24007d53c 100644
--- a/audio_dummy.c
+++ b/audio_dummy.c
@@ -69,7 +69,7 @@ static void stop(void) {
 }
 
 static void help(void) {
-    printf("There are no options for dummy audio.\n");
+    printf("    There are no options for dummy audio.\n");
 }
 
 audio_output audio_dummy = {
diff --git a/audio_pipe.c b/audio_pipe.c
index d6e5dee22..912f647d1 100644
--- a/audio_pipe.c
+++ b/audio_pipe.c
@@ -72,7 +72,7 @@ static void deinit(void) {
 }
 
 static void help(void) {
-    printf("pipe takes 1 argument: the name of the FIFO to write to.\n");
+    printf("    pipe takes 1 argument: the name of the FIFO to write to.\n");
 }
 
 audio_output audio_pipe = {