diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c
index 1f73f89a01a46da31947cbc99d2be79764380081..78fca1ee3c6b5556e2e9bcc91e2004807231cac3 100644
--- a/modules/stream_out/display.c
+++ b/modules/stream_out/display.c
@@ -42,7 +42,7 @@
 #define AUDIO_LONGTEXT N_( "Enable/disable audio rendering." )
 #define VIDEO_TEXT N_("Enable video")
 #define VIDEO_LONGTEXT N_( "Enable/disable video rendering." )
-#define DELAY_TEXT N_("Delay")
+#define DELAY_TEXT N_("Delay (ms)")
 #define DELAY_LONGTEXT N_( "Introduces a delay in the display of the stream." )
 
 static int  Open ( vlc_object_t * );
@@ -109,7 +109,7 @@ static int Open( vlc_object_t *p_this )
     p_sys->b_audio = var_GetBool( p_stream, SOUT_CFG_PREFIX"audio" );
     p_sys->b_video = var_GetBool( p_stream, SOUT_CFG_PREFIX "video" );
     p_sys->i_delay = var_GetInteger( p_stream, SOUT_CFG_PREFIX "delay" );
-    p_sys->i_delay *= 1000;
+    p_sys->i_delay = p_sys->i_delay * CLOCK_FREQ / 1000;
 
     p_stream->pf_add    = Add;
     p_stream->pf_del    = Del;