diff --git a/src/input/vlm.c b/src/input/vlm.c
index 69f454c6cac8c2897f5144db7ed051740b6e09fb..290100aad791c66a2bb3f29de98e353c9b1548d7 100644
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -736,7 +736,7 @@ static int vlm_ControlMediaAdd( vlm_t *p_vlm, vlm_media_t *p_cfg, int64_t *p_id
         p_vlm->p_vod = vlc_custom_create( VLC_OBJECT(p_vlm), sizeof( vod_t ),
                                           VLC_OBJECT_GENERIC, "vod server" );
         vlc_object_attach( p_vlm->p_vod, p_vlm->p_libvlc );
-        p_vlm->p_vod->p_module = module_need( p_vlm->p_vod, "vod server", NULL, false );
+        p_vlm->p_vod->p_module = module_need( p_vlm->p_vod, "vod server", "$vod-server", false );
         if( !p_vlm->p_vod->p_module )
         {
             msg_Err( p_vlm, "cannot find vod server" );
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index bfcdcc81833882e3c3d666b5a2f5af9bee3428a7..d6a9849cf0e56200facda8b78963eeef16c00674 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1124,6 +1124,11 @@ static const char *const ppsz_clock_descriptions[] =
     "the correct demuxer is not automatically detected. You should not "\
     "set this as a global option unless you really know what you are doing." )
 
+#define VOD_SERVER_TEXT N_("VoD server module")
+#define VOD_SERVER_LONGTEXT N_( \
+    "You can select which VoD server module you want to use. Set this " \
+    "to `vod_rtsp' to switch back to the old, legacy module." )
+
 #define RT_PRIORITY_TEXT N_("Allow real-time priority")
 #define RT_PRIORITY_LONGTEXT N_( \
     "Running VLC in real-time priority will allow for much more precise " \
@@ -2065,6 +2070,8 @@ vlc_module_begin ()
     add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT,
                 MEMCPY_LONGTEXT, true )
         change_need_restart ()
+    add_module( "vod-server", "vod server", NULL, NULL, VOD_SERVER_TEXT,
+                VOD_SERVER_LONGTEXT, true )
 
     set_section( N_("Plugins" ), NULL )
     add_bool( "plugins-cache", true, PLUGINS_CACHE_TEXT,