diff --git a/data/locale/english.locale b/data/locale/english.locale
index 253cbbd98..6497f436e 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1070,6 +1070,7 @@ menu.hint_record_apid_alt Record alternative non-AC3 audio pids
 menu.hint_record_apid_std Record first audio pid
 menu.hint_record_apids Configure audio pids to record
 menu.hint_record_apply Apply record options
+menu.hint_record_auto_cover Auto-create movie thumbnail for movie browser on record playback
 menu.hint_record_chandir Create directory with name of channel\nto store recording
 menu.hint_record_data Record (VideoText, subtitles) data streams
 menu.hint_record_data_dvbsub subtitle stream
@@ -1732,6 +1733,7 @@ recordingmenu.apids Audio streams
 recordingmenu.apids_ac3 record AC3 streams
 recordingmenu.apids_alt record alternative streams
 recordingmenu.apids_std record standard stream
+recordingmenu.auto_cover Auto-thumbnail
 recordingmenu.data_pids Data streams
 recordingmenu.defdir Recording directory
 recordingmenu.dvbsub_pids record dvbsub stream
diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp
index a3206aa1e..3b6b19c7f 100644
--- a/src/gui/record_setup.cpp
+++ b/src/gui/record_setup.cpp
@@ -245,6 +245,10 @@ int CRecordSetup::showRecordSetup()
 	ft->setHint("", LOCALE_MENU_HINT_RECORD_FILENAME_TEMPLATE);
 	recordingSettings->addItem(ft);
 
+	CMenuOptionChooser* cover = new CMenuOptionChooser(LOCALE_RECORDINGMENU_AUTO_COVER, &g_settings.auto_cover, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
+	cover->setHint("", LOCALE_MENU_HINT_RECORD_AUTO_COVER);
+	recordingSettings->addItem(cover);
+
 	recordingSettings->addItem(GenericMenuSeparatorLine);
 
 	if (!g_settings.easymenu) {
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 2f5ac5674..fd332e3f5 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -640,6 +640,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.screenshot_mode = configfile.getInt32( "screenshot_mode",  0);
 	g_settings.screenshot_video = configfile.getInt32( "screenshot_video",  1);
 	g_settings.screenshot_scale = configfile.getInt32( "screenshot_scale",  0);
+	g_settings.auto_cover = configfile.getInt32( "auto_cover",  0);
 
 	g_settings.screenshot_dir = configfile.getString( "screenshot_dir", "/media/sda1/movies" );
 	g_settings.cacheTXT = configfile.getInt32( "cacheTXT",  0);
@@ -1134,6 +1135,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setInt32( "screenshot_mode", g_settings.screenshot_mode );
 	configfile.setInt32( "screenshot_video", g_settings.screenshot_video );
 	configfile.setInt32( "screenshot_scale", g_settings.screenshot_scale );
+	configfile.setInt32( "auto_cover", g_settings.auto_cover );
 
 	configfile.setString( "screenshot_dir", g_settings.screenshot_dir);
 	configfile.setInt32( "cacheTXT", g_settings.cacheTXT );
diff --git a/src/system/locals.h b/src/system/locals.h
index 27cf674ef..fdd631538 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1097,6 +1097,7 @@ typedef enum
 	LOCALE_MENU_HINT_RECORD_APID_STD,
 	LOCALE_MENU_HINT_RECORD_APIDS,
 	LOCALE_MENU_HINT_RECORD_APPLY,
+	LOCALE_MENU_HINT_RECORD_AUTO_COVER,
 	LOCALE_MENU_HINT_RECORD_CHANDIR,
 	LOCALE_MENU_HINT_RECORD_DATA,
 	LOCALE_MENU_HINT_RECORD_DATA_DVBSUB,
@@ -1759,6 +1760,7 @@ typedef enum
 	LOCALE_RECORDINGMENU_APIDS_AC3,
 	LOCALE_RECORDINGMENU_APIDS_ALT,
 	LOCALE_RECORDINGMENU_APIDS_STD,
+	LOCALE_RECORDINGMENU_AUTO_COVER,
 	LOCALE_RECORDINGMENU_DATA_PIDS,
 	LOCALE_RECORDINGMENU_DEFDIR,
 	LOCALE_RECORDINGMENU_DVBSUB_PIDS,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index efd4de360..8cabc9637 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1097,6 +1097,7 @@ const char * locale_real_names[] =
 	"menu.hint_record_apid_std",
 	"menu.hint_record_apids",
 	"menu.hint_record_apply",
+	"menu.hint_record_auto_cover",
 	"menu.hint_record_chandir",
 	"menu.hint_record_data",
 	"menu.hint_record_data_dvbsub",
@@ -1759,6 +1760,7 @@ const char * locale_real_names[] =
 	"recordingmenu.apids_ac3",
 	"recordingmenu.apids_alt",
 	"recordingmenu.apids_std",
+	"recordingmenu.auto_cover",
 	"recordingmenu.data_pids",
 	"recordingmenu.defdir",
 	"recordingmenu.dvbsub_pids",
diff --git a/src/system/settings.h b/src/system/settings.h
index c40510f51..f763e8ca1 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -441,6 +441,7 @@ struct SNeutrinoSettings
 	int screenshot_mode;
 	int screenshot_video;
 	int screenshot_scale;
+	int auto_cover;
 	std::string screenshot_dir;
 
 	int key_current_transponder;