diff -Naur orig/DOCS/man/en/mplayer.1 main/DOCS/man/en/mplayer.1
--- orig/DOCS/man/en/mplayer.1	2006-01-07 14:20:39.000000000 +0100
+++ main/DOCS/man/en/mplayer.1	2006-01-08 19:57:34.516828848 +0100
@@ -545,6 +545,10 @@
 Specify configuration file to be parsed after the default ones.
 .
 .TP
+.B \-list-options
+Prints all available options.
+.
+.TP
 .B \-msglevel <all=<level>:<module>=<level>:...>
 Control verbosity directly for each module.
 The 'all' module changes the verbosity of all the modules not
@@ -775,10 +779,6 @@
 Specifies a configuration file for LIRC (default: ~/\:.lircrc).
 .
 .TP
-.B \-list-options
-Prints all available options.
-.
-.TP
 .B \-loop <number>
 Loops movie playback <number> times.
 0 means forever.
diff -Naur orig/parser-mecmd.c main/parser-mecmd.c
--- orig/parser-mecmd.c	2006-01-01 02:19:25.000000000 +0100
+++ main/parser-mecmd.c	2006-01-08 20:09:35.902161608 +0100
@@ -85,6 +85,12 @@
 	/* remove trailing '-' */
 	opt++;
 	mp_msg(MSGT_CFGPARSER, MSGL_DBG3, "this_opt = option: %s\n", opt);
+
+        if(strcasecmp(opt,"list-options") == 0) {
+	  m_config_print_option_list(config);
+         exit(1);
+        } else {
+
 	mp_opt = m_config_get_option(config,opt);
 	if(!mp_opt) {
 	  tmp = M_OPT_UNKNOWN;
@@ -114,6 +120,7 @@
 	    goto err_out;
 	  }
 	}
+	}
 	i += tmp;
       } else  {/* filename */
 	mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Adding file %s\n",argv[i]);