diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 3edfe1959..1617db0ac 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1288,6 +1288,7 @@ menu.hint_scrambled_message Bei aktivierter Option erscheint eine Meldung, wenn
 menu.hint_screen_setup Konfigurieren Sie den Bildschirmbereich für die Menüanzeige
 menu.hint_screensaver_dir Wählen Sie das Verzeichnis, in dem die Bilder für Ihren Bildschirmschoner gespeichert sind
 menu.hint_screensaver_timeout Wählen Sie Die Wartezeit bis zum Bilderwechsel des Bildschirmschoners
+menu.hint_screensaver_setup Konfigurieren Sie die Optionen des Bildschirmschoners für den Audioplayer
 menu.hint_screenshot_count Wählen Sie, wie viele Screenshots erstellt werden sollen
 menu.hint_screenshot_cover Während der Wiedergabe von Aufnahmen kann ein Screenshot für die Vorschau im Moviebrowser erstellt werden
 menu.hint_screenshot_dir Wählen Sie das Verzeichnis zum Speichern der Screenshots
@@ -2053,8 +2054,9 @@ scants.startnow Kanalsuche starten
 scants.test Empfangstest
 scants.transponders Transponder:
 scrambled_channel Verschlüsselung aktiv
-screensaver.dir Bildschirmschoner-Verzeichnis
-screensaver.timeout Bildschirmschoner-Wartezeit
+screensaver.dir Verzeichnis
+screensaver.timeout Wartezeit
+screensaver.setup Bildschirmschoner
 screensetup.lowerright grün = Bildrand unten, rechts
 screensetup.upperleft rot = Bildrand oben, links
 screenshot.count Anzahl
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 6185fb62d..e18efb5ee 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1292,6 +1292,7 @@ menu.hint_scrambled_message Show scrambled message, when channel cannot be decod
 menu.hint_screen_setup Configure screen margins
 menu.hint_screensaver_dir Select directory in which the screensaver has to start.
 menu.hint_screensaver_timeout Select the timeout to change pictures in screensavers
+menu.hint_screensaver_setup Configure screensaver options for audioplayer
 menu.hint_screenshot_count When no GUI on screen, you can save 1-5\nscreenshot serie
 menu.hint_screenshot_cover ON: When playing record, overwrite single\nscreenshot to show inside MovieBrowser
 menu.hint_screenshot_dir Select directory to save screenshots
@@ -2058,8 +2059,9 @@ scants.startnow start scan
 scants.test Test signal
 scants.transponders Transponders:
 scrambled_channel Scrambled channel
-screensaver.dir Screensaver directory
-screensaver.timeout Screensaver timeout
+screensaver.dir Directory
+screensaver.menu Screensaver
+screensaver.timeout Timeout
 screensetup.lowerright green = setup lower right
 screensetup.upperleft red = setup upper left
 screenshot.count Count
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 76bede0e2..5520f6b9d 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -570,6 +570,13 @@ int COsdSetup::showOsdSetup()
 	mf->setHint("", LOCALE_MENU_HINT_SCREENSHOT_SETUP);
 	osd_menu->addItem(mf);
 
+	//screensaver
+	CMenuWidget osd_menu_screensaver(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_SCREENSAVER);
+	showOsdScreensaverSetup(&osd_menu_screensaver);
+	mf = new CMenuForwarder(LOCALE_SCREENSAVER_MENU, true, NULL, &osd_menu_screensaver, NULL, CRCInput::convertDigitToKey(shortcut++));
+	mf->setHint("", LOCALE_MENU_HINT_SCREENSAVER_SETUP);
+	osd_menu->addItem(mf);
+
 	osd_menu->addItem(GenericMenuSeparatorLine);
 
 	//monitor
@@ -612,19 +619,6 @@ int COsdSetup::showOsdSetup()
 	mc->setHint("", LOCALE_MENU_HINT_SUBCHANNEL_POS);
 	osd_menu->addItem(mc);
 
-	osd_menu->addItem(GenericMenuSeparatorLine);
-
-	// screensaver_dir
-	mf = new CMenuForwarder(LOCALE_SCREENSAVER_DIR, true, g_settings.screensaver_dir, this, "screensaver_dir");
-	mf->setHint("", LOCALE_MENU_HINT_SCREENSAVER_DIR);
-	osd_menu->addItem(mf);
-
-	// screensaver timeout
-	CMenuOptionNumberChooser* nc = new CMenuOptionNumberChooser(LOCALE_SCREENSAVER_TIMEOUT, &g_settings.screensaver_timeout, true, 10, 60);
-	nc->setNumberFormat(std::string("%d ") + g_Locale->getText(LOCALE_UNIT_SHORT_SECOND));
-	nc->setHint("", LOCALE_MENU_HINT_SCREENSAVER_TIMEOUT);
-	osd_menu->addItem(nc);
-
 	int oldVolumeSize = g_settings.volume_size;
 	int oldInfoClockSize = g_settings.infoClockFontSize;
 
@@ -1268,6 +1262,22 @@ void COsdSetup::showOsdScreenShotSetup(CMenuWidget *menu_screenshot)
 	menu_screenshot->addItem(mc);
 }
 
+void COsdSetup::showOsdScreensaverSetup(CMenuWidget *menu_screensaver)
+{
+	menu_screensaver->addIntroItems(LOCALE_SCREENSAVER_MENU);
+
+	// screensaver_dir
+	CMenuForwarder *mf = new CMenuForwarder(LOCALE_SCREENSAVER_DIR, true, g_settings.screensaver_dir, this, "screensaver_dir");
+	mf->setHint("", LOCALE_MENU_HINT_SCREENSAVER_DIR);
+	menu_screensaver->addItem(mf);
+
+	// screensaver timeout
+	CMenuOptionNumberChooser* nc = new CMenuOptionNumberChooser(LOCALE_SCREENSAVER_TIMEOUT, &g_settings.screensaver_timeout, true, 10, 60);
+	nc->setNumberFormat(std::string("%d ") + g_Locale->getText(LOCALE_UNIT_SHORT_SECOND));
+	nc->setHint("", LOCALE_MENU_HINT_SCREENSAVER_TIMEOUT);
+	menu_screensaver->addItem(nc);
+}
+
 void COsdSetup::paintWindowSize(int w, int h)
 {
 	if (win_demo == NULL) {
diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h
index be227c04e..85344c5b4 100644
--- a/src/gui/osd_setup.h
+++ b/src/gui/osd_setup.h
@@ -71,6 +71,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
 		void showOsdVolumeSetup(CMenuWidget *menu_volume);
 		void showOsdInfoclockSetup(CMenuWidget *menu_infoclock);
 		void showOsdScreenShotSetup(CMenuWidget *menu_screenshot);
+		void showOsdScreensaverSetup(CMenuWidget *menu_screensaver);
 		void paintWindowSize(int w, int h);
 
  		void AddFontSettingItem(CMenuWidget &font_Settings, const SNeutrinoSettings::FONT_TYPES number_of_fontsize_entry);
diff --git a/src/neutrino_menue.h b/src/neutrino_menue.h
index e8e49fc1f..cb261abab 100644
--- a/src/neutrino_menue.h
+++ b/src/neutrino_menue.h
@@ -63,6 +63,7 @@ enum MN_WIDGET_ID
 	MN_WIDGET_ID_OSDSETUP_MENUCOLORS,
 	MN_WIDGET_ID_OSDSETUP_TIMEOUT,
 	MN_WIDGET_ID_OSDSETUP_SCREENSHOT,
+	MN_WIDGET_ID_OSDSETUP_SCREENSAVER,
 	MN_WIDGET_ID_OSDSETUP_VOLUME,
 	MN_WIDGET_ID_OSDSETUP_INFOCLOCK,
 	MN_WIDGET_ID_OSDSETUP_PROGRESSBAR,
diff --git a/src/system/locals.h b/src/system/locals.h
index bf4383761..d428502dc 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1319,6 +1319,7 @@ typedef enum
 	LOCALE_MENU_HINT_SCREEN_SETUP,
 	LOCALE_MENU_HINT_SCREENSAVER_DIR,
 	LOCALE_MENU_HINT_SCREENSAVER_TIMEOUT,
+	LOCALE_MENU_HINT_SCREENSAVER_SETUP,
 	LOCALE_MENU_HINT_SCREENSHOT_COUNT,
 	LOCALE_MENU_HINT_SCREENSHOT_COVER,
 	LOCALE_MENU_HINT_SCREENSHOT_DIR,
@@ -2086,6 +2087,7 @@ typedef enum
 	LOCALE_SCANTS_TRANSPONDERS,
 	LOCALE_SCRAMBLED_CHANNEL,
 	LOCALE_SCREENSAVER_DIR,
+	LOCALE_SCREENSAVER_MENU,
 	LOCALE_SCREENSAVER_TIMEOUT,
 	LOCALE_SCREENSETUP_LOWERRIGHT,
 	LOCALE_SCREENSETUP_UPPERLEFT,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 1e0179675..d41f442f0 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1319,6 +1319,7 @@ const char * locale_real_names[] =
 	"menu.hint_screen_setup",
 	"menu.hint_screensaver_dir",
 	"menu.hint_screensaver_timeout",
+	"menu.hint_screensaver_setup",
 	"menu.hint_screenshot_count",
 	"menu.hint_screenshot_cover",
 	"menu.hint_screenshot_dir",
@@ -2086,6 +2087,7 @@ const char * locale_real_names[] =
 	"scants.transponders",
 	"scrambled_channel",
 	"screensaver.dir",
+	"screensaver.menu",
 	"screensaver.timeout",
 	"screensetup.lowerright",
 	"screensetup.upperleft",