diff --git a/src/emu/clifront.c b/src/emu/clifront.c
index 38b1f4bdf1f..787f9c6fd2e 100644
--- a/src/emu/clifront.c
+++ b/src/emu/clifront.c
@@ -95,6 +95,9 @@ static const options_entry cli_options[] =
 	{ "verifysamples",            "0",        OPTION_COMMAND,    "report samplesets that have problems" },
 	{ "romident",                 "0",        OPTION_COMMAND,    "compare files with known MAME roms" },
 	{ "listdevices;ld",           "0",        OPTION_COMMAND,    "list available devices" },
+#ifdef MESS
+	{ "listmedia;lm",             "0",        OPTION_COMMAND,    "list available media for the system" },
+#endif
 
 	{ NULL }
 };
@@ -270,6 +273,9 @@ static int execute_commands(core_options *options, const char *exename, const ga
 		{ CLIOPTION_VERIFYROMS,		info_verifyroms },
 		{ CLIOPTION_VERIFYSAMPLES,	info_verifysamples },
 		{ CLIOPTION_ROMIDENT,		info_romident }
+#ifdef MESS
+		{ CLIOPTION_LISTMEDIA,		info_listmedia },
+#endif
 	};
 	int i;
 
diff --git a/src/emu/clifront.h b/src/emu/clifront.h
index 7e60a046183..f7b3912d745 100644
--- a/src/emu/clifront.h
+++ b/src/emu/clifront.h
@@ -38,6 +38,7 @@
 #define CLIOPTION_VERIFYROMS			"verifyroms"
 #define CLIOPTION_VERIFYSAMPLES			"verifysamples"
 #define CLIOPTION_ROMIDENT				"romident"
+#define CLIOPTION_LISTMEDIA				"listmedia"		// needed by MESS