diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 779eae82bc..37b5d1daf4 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -1107,15 +1107,14 @@ Falls back on IPv4 automatically.
 .TP
 .B \-rawaudio <option1:option2:...>
 This option lets you play raw audio files.
+You have to use \-demuxer rawaudio as well.
 It may also be used to play audio CDs which are not 44kHz 16-bit stereo.
-For playing raw AC3 streams use \-rawaudio on:format=0x2000.
+For playing raw AC3 streams use \-rawaudio format=0x2000 \-demuxer rawaudio.
 .sp 1
 Available options are:
 .sp 1
 .PD 0
 .RSs
-.IPs on\ \ \ 
-Use raw audio demuxer.
 .IPs channels=<value>
 number of channels
 .IPs rate=<value>
@@ -1132,13 +1131,12 @@ fourcc in hex
 .TP
 .B \-rawvideo <option1:option2:...>
 This option lets you play raw video files.
+You have to use \-demuxer rawvideo as well.
 .sp 1
 Available options are:
 .sp 1
 .PD 0
 .RSs
-.IPs on\ \ \ 
-Use raw video demuxer.
 .IPs fps=<value>
 rate in frames per second (default: 25.0)
 .IPs sqcif|qcif|cif|4cif|pal|ntsc
@@ -8959,7 +8957,7 @@ mplayer dummy.avi \-sub source.sub \-dumpmpsub
 .
 .TP
 .B Convert subtitles to MPsub format without watching the movie:
-mplayer /dev/\:zero \-rawvideo on:pal:fps=xx \-vc null \-vo null \-noframedrop
+mplayer /dev/\:zero \-rawvideo pal:fps=xx -demuxer rawvideo \-vc null \-vo null \-noframedrop
 \-benchmark \-sub source.sub \-dumpmpsub
 .
 .TP
@@ -8977,7 +8975,7 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
 .
 .TP
 .B Play a 6-channel AAC file with only two speakers:
-mplayer \-rawaudio on:format=0xff \-af pan=2:.32:.32:.39:.06:.06:.39:.17:-.17:-.17:.17:.33:.33 adts_he-aac160_51.aac
+mplayer \-rawaudio format=0xff \-demuxer rawaudio \-af pan=2:.32:.32:.39:.06:.06:.39:.17:-.17:-.17:.17:.33:.33 adts_he-aac160_51.aac
 .br
 You might want to play a bit with the pan values (e.g multiply with a value) to
 increase volume or avoid clipping.
diff --git a/libmpdemux/demux_rawaudio.c b/libmpdemux/demux_rawaudio.c
index 959bfbfb46..df8d2dccc6 100644
--- a/libmpdemux/demux_rawaudio.c
+++ b/libmpdemux/demux_rawaudio.c
@@ -21,7 +21,6 @@ static int bitrate = 0;
 static int format = 0x1; // Raw PCM
 
 m_option_t demux_rawaudio_opts[] = {
-  { "on", &demuxer_type, CONF_TYPE_FLAG, 0,0, DEMUXER_TYPE_RAWAUDIO, NULL },
   { "channels", &channels, CONF_TYPE_INT,CONF_RANGE,1,8, NULL },
   { "rate", &samplerate, CONF_TYPE_INT,CONF_RANGE,1000,8*48000, NULL },
   { "samplesize", &samplesize, CONF_TYPE_INT,CONF_RANGE,1,8, NULL },
diff --git a/libmpdemux/demux_rawvideo.c b/libmpdemux/demux_rawvideo.c
index 113c4b09f3..1bfc616dbb 100644
--- a/libmpdemux/demux_rawvideo.c
+++ b/libmpdemux/demux_rawvideo.c
@@ -23,7 +23,6 @@ static float fps = 25;
 static int imgsize=0;
 
 m_option_t demux_rawvideo_opts[] = {
-  { "on", &demuxer_type, CONF_TYPE_FLAG, 0,0, DEMUXER_TYPE_RAWVIDEO, NULL },
   // size:
   { "w", &width, CONF_TYPE_INT,CONF_RANGE,1,8192, NULL },
   { "h", &height, CONF_TYPE_INT,CONF_RANGE,1,8192, NULL },