diff --git a/modules/LIST b/modules/LIST
index a632a30f8a80babd34003e5adaba2c951c92b3ab..11eb8c23eb1d96744ad22f9b8073c671423b0aea 100644
--- a/modules/LIST
+++ b/modules/LIST
@@ -37,6 +37,7 @@ $Id$
  * access_vdr: VDR access module
  * adjust: Contrast/Hue/saturation/Brightness adjust module
  * adpcm: ADPCM audio decoder
+ * adummy: dummy audio output
  * aes3: aes3 decoder/packetizer
  * aiff: AIFF demuxer
  * alphamask: Alpha layer mask video filter
diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am
index a258456c7d4ba05d6637fa9e5f34688d1078560e..5faa6826cc1b796c79a51f816ad2d4127b68e549 100644
--- a/modules/audio_output/Modules.am
+++ b/modules/audio_output/Modules.am
@@ -7,12 +7,18 @@ SOURCES_jack = jack.c
 SOURCES_audioqueue = audioqueue.c
 SOURCES_opensles_android = opensles_android.c
 
+libadummy_plugin_la_SOURCES = adummy.c
+libadummy_plugin_la_CFLAGS = $(AM_CFLAGS)
+libadummy_plugin_la_LIBADD = $(AM_LIBADD)
+libadummy_plugin_la_DEPENDENCIES =
+
 libamem_plugin_la_SOURCES = amem.c
 libamem_plugin_la_CFLAGS = $(AM_CFLAGS)
 libamem_plugin_la_LIBADD = $(AM_LIBADD)
 libamem_plugin_la_DEPENDENCIES =
 
 libvlc_LTLIBRARIES += \
+	libadummy_plugin.la \
 	libamem_plugin.la \
 	libaout_file_plugin.la
 
diff --git a/modules/misc/dummy/aout.c b/modules/audio_output/adummy.c
similarity index 88%
rename from modules/misc/dummy/aout.c
rename to modules/audio_output/adummy.c
index b12fef78c6d65155a6549409cd88df45e631967a..2b67a4a4146f53cb26148975906e4224e3d1d7bb 100644
--- a/modules/misc/dummy/aout.c
+++ b/modules/audio_output/adummy.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * aout.c : dummy audio output plugin
+ * adummy.c : dummy audio output plugin
  *****************************************************************************
  * Copyright (C) 2002 the VideoLAN team
  * $Id$
@@ -30,10 +30,19 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_cpu.h>
 
-#include "dummy.h"
+static int Open( vlc_object_t * p_this );
+
+vlc_module_begin ()
+    set_shortname( N_("Dummy") )
+    set_description( N_("Dummy audio output") )
+    set_capability( "audio output", 1 )
+    set_callbacks( Open, NULL )
+    add_shortcut( "dummy" )
+vlc_module_end ()
 
 #define FRAME_SIZE 2048
 #define A52_FRAME_NB 1536
@@ -46,7 +55,7 @@ static void Play( audio_output_t *, block_t * );
 /*****************************************************************************
  * OpenAudio: open a dummy audio device
  *****************************************************************************/
-int OpenAudio ( vlc_object_t * p_this )
+static int Open( vlc_object_t * p_this )
 {
     audio_output_t * p_aout = (audio_output_t *)p_this;
 
@@ -80,4 +89,3 @@ static void Play( audio_output_t *aout, block_t *block )
     block_Release( block );
     (void) aout;
 }
-
diff --git a/modules/misc/dummy/Modules.am b/modules/misc/dummy/Modules.am
index 300177d126abeb535c3d549ee4c694f49e1993f9..e0fb8fb452a309bfea5768014af18c6bd1227e4b 100644
--- a/modules/misc/dummy/Modules.am
+++ b/modules/misc/dummy/Modules.am
@@ -1,7 +1,6 @@
 SOURCES_dummy = \
 	dummy.c \
 	dummy.h \
-	aout.c \
 	vout.c \
 	interface.c \
 	input.c \
diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c
index 00fb584661b42c2fe7b23a90540c124d3b515269..a38660513f8ce409be458eda059fa118f566dfcc 100644
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/dummy/dummy.c
@@ -92,10 +92,6 @@ vlc_module_begin ()
         set_description( N_("Dummy encoder function") )
         set_capability( "encoder", 0 )
         set_callbacks( OpenEncoder, CloseEncoder )
-    add_submodule ()
-        set_description( N_("Dummy audio output function") )
-        set_capability( "audio output", 1 )
-        set_callbacks( OpenAudio, NULL )
     add_submodule ()
         set_description( N_("Dummy video output function") )
         set_section( N_( "Dummy Video output" ), NULL )
diff --git a/modules/misc/dummy/dummy.h b/modules/misc/dummy/dummy.h
index 97837e962779e34c5631279850782a17d2b31132..e4b00ebce125456a347ee38bf6ea993fc168fa28 100644
--- a/modules/misc/dummy/dummy.h
+++ b/modules/misc/dummy/dummy.h
@@ -36,8 +36,6 @@ void CloseDecoder   ( vlc_object_t * );
 int  OpenEncoder  ( vlc_object_t * );
 void CloseEncoder ( vlc_object_t * );
 
-int  OpenAudio    ( vlc_object_t * );
-
 int  OpenVideo    ( vlc_object_t * );
 int  OpenVideoStat( vlc_object_t * );
 void CloseVideo   ( vlc_object_t * );
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a29cf92f8b2ddfa1a195b745d2e2e33f5008baa4..07c60e71e27e7ac3cc49bd47022bc502c2c94a62 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -314,6 +314,7 @@ modules/audio_filter/spatializer/tuning.h
 modules/audio_mixer/fixed32.c
 modules/audio_mixer/float32.c
 modules/audio_mixer/trivial.c
+modules/audio_output/adummy.c
 modules/audio_output/alsa.c
 modules/audio_output/amem.c
 modules/audio_output/audioqueue.c
@@ -906,7 +907,6 @@ modules/meta_engine/folder.c
 modules/meta_engine/taglib.cpp
 modules/misc/audioscrobbler.c
 modules/misc/dhparams.h
-modules/misc/dummy/aout.c
 modules/misc/dummy/decoder.c
 modules/misc/dummy/dummy.c
 modules/misc/dummy/dummy.h