diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 57a2b642f5..8ca7978b1c 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -46,11 +46,16 @@ struct config conf[]={
         {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1},
 	{"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 },
 #ifdef HAVE_LIBCSS
-        {"dvd", &dvd_device, CONF_TYPE_STRING, 0, 0, 0},
+        {"dvdauth", &dvd_auth_device, CONF_TYPE_STRING, 0, 0, 0},
         {"dvdkey", &dvdimportkey, CONF_TYPE_STRING, 0, 0, 0},
+	{"dvd", "Option -dvd will be \"full disk\" mode, old meaning has been renamed to -dvdauth.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
 #else
         {"dvd", "DVD support was not compiled in. See file DOCS/DVD.\n",
             CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
+        {"dvdkey", "DVD support was not compiled in. See file DOCS/DVD.\n",
+            CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
+        {"dvdauth", "DVD support was not compiled in. See file DOCS/DVD.\n",
+            CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
 #endif
 			    
 #ifdef HAVE_FBDEV
diff --git a/dvdauth.c b/dvdauth.c
index 6990fef643..fb041dae36 100644
--- a/dvdauth.c
+++ b/dvdauth.c
@@ -20,7 +20,7 @@
 
 #include "dvdauth.h"
 
-char *dvd_device=NULL;
+char *dvd_auth_device=NULL;
 unsigned char key_disc[2048];
 unsigned char key_title[5];
 unsigned char *dvdimportkey=NULL;
diff --git a/dvdauth.h b/dvdauth.h
index 763e79d40f..4203c9cb4b 100644
--- a/dvdauth.h
+++ b/dvdauth.h
@@ -3,7 +3,7 @@
 #ifndef _MPLAYER_CSS_H
 #define _MPLAYER_CSS_H
 
-extern char *dvd_device;
+extern char *dvd_auth_device;
 extern unsigned char key_disc[];
 extern unsigned char key_title[];
 extern unsigned char *dvdimportkey;
diff --git a/mplayer.c b/mplayer.c
index 51694fd45b..33b8fc4eb9 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -632,8 +632,8 @@ if(vcd_track){
     }
     printf("DVD command line requested key is stored for descrambling.\n");
   }
-  if (dvd_device) {
-    if (dvd_auth(dvd_device,f)) {
+  if (dvd_auth_device) {
+    if (dvd_auth(dvd_auth_device,f)) {
         GUI_MSG( mplErrorDVDAuth )
         exit(0);
       }