diff --git a/src/menus/options-data-1.c b/src/menus/options-data-1.c
index 8d2b8ef56..632da7977 100644
--- a/src/menus/options-data-1.c
+++ b/src/menus/options-data-1.c
@@ -7,7 +7,7 @@
 menuitem_t OPTIONS_Data[] =
 {
 
-	{IT_STRING | IT_SUBMENU, "Screenshot Options...", "Set options relative to screenshot and GIF capture.",
+	{IT_STRING | IT_SUBMENU, "Media Options...", "Set options relative to screenshot and movie capture.",
 		NULL, {.submenu = &OPTIONS_DataScreenshotDef}, 0, 0},
 
 	{IT_STRING | IT_SUBMENU, "Addon Options...", "Set options relative to the addons menu.",
diff --git a/src/menus/options-data-screenshots.c b/src/menus/options-data-screenshots.c
index 8f27953f9..809eb5e1b 100644
--- a/src/menus/options-data-screenshots.c
+++ b/src/menus/options-data-screenshots.c
@@ -3,6 +3,7 @@
 
 #include "../k_menu.h"
 #include "../m_misc.h" // screenshot cvars
+#include "../m_avrecorder.h"
 
 menuitem_t OPTIONS_DataScreenshot[] =
 {
@@ -19,13 +20,19 @@ menuitem_t OPTIONS_DataScreenshot[] =
 	{IT_SPACE | IT_NOTHING, NULL,  NULL,
 		NULL, {NULL}, 0, 0},
 
-	{IT_HEADER, "GIF RECORDING (F9)", NULL,
+	{IT_HEADER, "MOVIE RECORDING (F9)", NULL,
 		NULL, {NULL}, 0, 0},
 
-	{IT_STRING | IT_CVAR, "Storage Location", "Sets where to store GIFs",
+	{IT_STRING | IT_CVAR, "Recording Format", "What file format will movies will be recorded in?",
+		NULL, {.cvar = &cv_moviemode}, 0, 0},
+
+	{IT_STRING | IT_CVAR, "Real-Time Data", "If enabled, shows fps, duration and filesize of recording in real-time.",
+		NULL, {.cvar = &cv_movie_showfps}, 0, 0},
+
+	{IT_STRING | IT_CVAR, "Storage Location", "Sets where to store movies.",
 		NULL, {.cvar = &cv_movie_option}, 0, 0},
 
-	{IT_STRING | IT_CVAR | IT_CV_STRING, "Custom Folder", "Specify which folder to save GIFs in.",
+	{IT_STRING | IT_CVAR | IT_CV_STRING, "Custom Folder", "Specify which folder to save videos in.",
 		NULL, {.cvar = &cv_movie_folder}, 24, 0},
 
 };
@@ -56,6 +63,10 @@ void Screenshot_option_Onchange(void)
 
 void Moviemode_mode_Onchange(void)
 {
+	// opt 7 in a 0 based array, you get the idea...
+	OPTIONS_DataScreenshot[6].status =
+		(cv_moviemode.value == MM_AVRECORDER ? IT_CVAR|IT_STRING : IT_DISABLED);
+
 #if 0
 	INT32 i, cstart, cend;
 	for (i = op_screenshot_gif_start; i <= op_screenshot_apng_end; ++i)
@@ -81,7 +92,7 @@ void Moviemode_mode_Onchange(void)
 
 void Moviemode_option_Onchange(void)
 {
-	// opt 7 in a 0 based array, you get the idea...
-	OPTIONS_DataScreenshot[6].status =
+	// opt 9 in a 0 based array, you get the idea...
+	OPTIONS_DataScreenshot[8].status =
 		(cv_movie_option.value == 3 ? IT_CVAR|IT_STRING|IT_CV_STRING : IT_DISABLED);
 }