diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 89af46a2c..fe064aa26 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -165,6 +165,7 @@ audioplayer.artist_title Interpret, Titel
 audioplayer.building_search_index Erstelle Suchindex
 audioplayer.button_select_title_by_id Suche nach ID
 audioplayer.button_select_title_by_name Suche nach Name
+audioplayer.cover_as_screensaver Cover als Bildschirmschoner
 audioplayer.defdir Start-Verzeichnis
 audioplayer.delete Entfernen
 audioplayer.deleteall Alle entfernen
@@ -1030,6 +1031,7 @@ menu.hint_audio_srs_nmgr Schalten Sie den NoiseManager ein oder aus
 menu.hint_audio_srs_volume Legen Sie die Referenzlautstärke für SRS TruVolume fest
 menu.hint_audio_volstart Legen Sie die Einschaltlautstärke fest, die immer beim Starten eingestellt werden soll
 menu.hint_audio_volstep Beim Betätigen der Lautstärketasten wird die Lautstärke immer schrittweise nach diesem Wert geändert
+menu.hint_audioplayer_cover_as_screensaver Verwendet das Cover des Titels oder "folder.jpg" als Bildschirmschoner
 menu.hint_audioplayer_defdir Wählen Sie das Startverzeichnis für den Audioplayer
 menu.hint_audioplayer_follow Das Auswählen eines aktuellen Titels in der Wiedergabeliste zulassen
 menu.hint_audioplayer_highprio Erhöhen Sie die Priorität der Wiedergabe
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 8c1ee75ae..42ff6f743 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -165,6 +165,7 @@ audioplayer.artist_title Artist, Title
 audioplayer.building_search_index Building search index
 audioplayer.button_select_title_by_id Search by ID
 audioplayer.button_select_title_by_name Search by name
+audioplayer.cover_as_screensaver Cover as screensaver
 audioplayer.defdir Start directory
 audioplayer.delete Remove
 audioplayer.deleteall Remove all
@@ -1030,6 +1031,7 @@ menu.hint_audio_srs_nmgr Noise manager
 menu.hint_audio_srs_volume Reference level to maintain
 menu.hint_audio_volstart Always set selected volume value on boot
 menu.hint_audio_volstep Volume +/- keys increase/decrease step
+menu.hint_audioplayer_cover_as_screensaver Use title's cover or "folder.jpg" as screensaver
 menu.hint_audioplayer_defdir Default audioplayer directory
 menu.hint_audioplayer_follow Move playlist selected pointer\nto current playing song
 menu.hint_audioplayer_highprio Increase playback priority
diff --git a/src/gui/audioplayer_setup.cpp b/src/gui/audioplayer_setup.cpp
index 4f5380771..e32437041 100644
--- a/src/gui/audioplayer_setup.cpp
+++ b/src/gui/audioplayer_setup.cpp
@@ -134,6 +134,10 @@ int CAudioPlayerSetup::showAudioPlayerSetup()
 	mc->setHint("", LOCALE_MENU_HINT_AUDIOPLAYER_PLAYLIST);
 	audioplayerSetup->addItem(mc);
 
+	mc = new CMenuOptionChooser(LOCALE_AUDIOPLAYER_COVER_AS_SCREENSAVER, &g_settings.audioplayer_cover_as_screensaver, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true);
+	mc->setHint("", LOCALE_MENU_HINT_AUDIOPLAYER_COVER_AS_SCREENSAVER);
+	audioplayerSetup->addItem(mc);
+
 	mc = new CMenuOptionChooser(LOCALE_AUDIOPLAYER_HIGHPRIO, &g_settings.audioplayer_highprio, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true );
 	mc->setHint("", LOCALE_MENU_HINT_AUDIOPLAYER_HIGHPRIO);
 	audioplayerSetup->addItem(mc);
diff --git a/src/system/locals.h b/src/system/locals.h
index 64372d744..3bad78e9e 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -192,6 +192,7 @@ typedef enum
 	LOCALE_AUDIOPLAYER_BUILDING_SEARCH_INDEX,
 	LOCALE_AUDIOPLAYER_BUTTON_SELECT_TITLE_BY_ID,
 	LOCALE_AUDIOPLAYER_BUTTON_SELECT_TITLE_BY_NAME,
+	LOCALE_AUDIOPLAYER_COVER_AS_SCREENSAVER,
 	LOCALE_AUDIOPLAYER_DEFDIR,
 	LOCALE_AUDIOPLAYER_DELETE,
 	LOCALE_AUDIOPLAYER_DELETEALL,
@@ -1057,6 +1058,7 @@ typedef enum
 	LOCALE_MENU_HINT_AUDIO_SRS_VOLUME,
 	LOCALE_MENU_HINT_AUDIO_VOLSTART,
 	LOCALE_MENU_HINT_AUDIO_VOLSTEP,
+	LOCALE_MENU_HINT_AUDIOPLAYER_COVER_AS_SCREENSAVER,
 	LOCALE_MENU_HINT_AUDIOPLAYER_DEFDIR,
 	LOCALE_MENU_HINT_AUDIOPLAYER_FOLLOW,
 	LOCALE_MENU_HINT_AUDIOPLAYER_HIGHPRIO,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 45f1195e9..d27b3ed10 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -192,6 +192,7 @@ const char * locale_real_names[] =
 	"audioplayer.building_search_index",
 	"audioplayer.button_select_title_by_id",
 	"audioplayer.button_select_title_by_name",
+	"audioplayer.cover_as_screensaver",
 	"audioplayer.defdir",
 	"audioplayer.delete",
 	"audioplayer.deleteall",
@@ -1057,6 +1058,7 @@ const char * locale_real_names[] =
 	"menu.hint_audio_srs_volume",
 	"menu.hint_audio_volstart",
 	"menu.hint_audio_volstep",
+	"menu.hint_audioplayer_cover_as_screensaver",
 	"menu.hint_audioplayer_defdir",
 	"menu.hint_audioplayer_follow",
 	"menu.hint_audioplayer_highprio",