Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(revision 31387)
+++ apps/lang/english.lang	(working copy)
@@ -3939,7 +3939,7 @@
 </phrase>
 <phrase>
   id: LANG_TIME_MENU
-  desc: in the system sub menu
+  desc: in settings_menu
   user: core
   <source>
     *: none
@@ -12965,3 +12965,17 @@
     *: "Glyphs To Cache"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_TIME_SETTINGS_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Time Settings"
+  </source>
+  <dest>
+    *: "Time Settings"
+  </dest>
+  <voice>
+    *: "Time Settings"
+  </voice>
+</phrase>
Index: apps/menus/exported_menus.h
===================================================================
--- apps/menus/exported_menus.h	(revision 31387)
+++ apps/menus/exported_menus.h	(working copy)
@@ -38,13 +38,18 @@
         sound_settings,             /* sound_menu.c     */
         settings_menu_item,         /* settings_menu.c  */
         bookmark_settings_menu,
-        sleep_timer_call,           /* main_menu.c */
         playlist_settings,          /* playlist_menu.c  */
         equalizer_menu,             /* eq_menu.c        */
 #ifdef AUDIOHW_HAVE_EQ
         audiohw_eq_tone_controls,   /* audiohw_eq_menu.c */
 #endif
         radio_settings_menu,        /* radio_menu.c     */
+#ifdef HAVE_RTC_ALARM
+        alarm_screen_call,          /* time_menu.c      */
+#if defined(HAVE_RECORDING) || CONFIG_TUNER
+        alarm_wake_up_screen,       /* time_menu.c      */
+#endif
+#endif
         theme_menu;                 /* theme_menu.c     */
 
 struct browse_folder_info {
Index: apps/menus/main_menu.c
===================================================================
--- apps/menus/main_menu.c	(revision 31387)
+++ apps/menus/main_menu.c	(working copy)
@@ -453,6 +453,8 @@
     return 0;
 }
 
+MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL);
+
 #if CONFIG_RTC
 int time_screen(void* ignored);
 MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU),
@@ -461,10 +463,21 @@
 MENUITEM_FUNCTION_DYNTEXT(sleep_timer_call, 0, sleep_timer, NULL, sleep_timer_getname,
                           sleep_timer_voice, NULL, NULL, Icon_Menu_setting);
                            /* make it look like a setting to the user */
-#if CONFIG_RTC == 0
 MENUITEM_SETTING(sleeptimer_on_startup,
                  &global_settings.sleeptimer_on_startup, NULL);
+
+MAKE_MENU(time_settings, ID2P(LANG_TIME_SETTINGS_MENU), NULL, Icon_Config,
+#if CONFIG_RTC
+          &timedate_item,
 #endif
+          &sleep_timer_call, &poweroff,
+#ifdef HAVE_RTC_ALARM
+          &alarm_screen_call,
+#if defined(HAVE_RECORDING) || CONFIG_TUNER
+          &alarm_wake_up_screen,
+#endif
+#endif
+          &sleeptimer_on_startup);
 
 MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS),
                    (menu_function)show_credits, NULL, NULL, Icon_NOICON);
@@ -509,11 +522,7 @@
 #ifdef HAVE_RECORDING
         &recording_settings,
 #endif
-#if CONFIG_RTC
-        &timedate_item,
-#else
-        &sleep_timer_call, &sleeptimer_on_startup,
-#endif
+        &time_settings,
         &manage_settings,
         );
 /*    MAIN MENU                    */
Index: apps/menus/time_menu.c
===================================================================
--- apps/menus/time_menu.c	(revision 31387)
+++ apps/menus/time_menu.c	(working copy)
@@ -31,7 +31,6 @@
 #include "powermgmt.h"
 #include "menu.h"
 #include "misc.h"
-#include "exported_menus.h"
 #include "keyboard.h"
 #include "talk.h"
 #include "time.h"
@@ -136,8 +135,6 @@
 #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */
 
 #endif /* HAVE_RTC_ALARM */
-MENUITEM_SETTING(sleeptimer_on_startup,
-                 &global_settings.sleeptimer_on_startup, NULL);
 
 void talk_timedate(void)
 {
@@ -237,14 +234,7 @@
 
 
 MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), time_menu_callback, Icon_NOICON,
-          &time_set, &sleep_timer_call,
-#ifdef HAVE_RTC_ALARM
-          &alarm_screen_call,
-#if defined(HAVE_RECORDING) || CONFIG_TUNER
-          &alarm_wake_up_screen,
-#endif
-#endif
-          &sleeptimer_on_startup, &timeformat);
+          &time_set, &timeformat);
 
 int time_screen(void* ignored)
 {
Index: apps/menus/settings_menu.c
===================================================================
--- apps/menus/settings_menu.c	(revision 31387)
+++ apps/menus/settings_menu.c	(working copy)
@@ -215,9 +215,6 @@
          );
 #endif
 
-/* System menu */
-MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL);
-
 /* Limits menu */
 MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL);
 MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL);
@@ -310,7 +307,6 @@
 #if defined(HAVE_DIRCACHE) || defined(HAVE_DISK_STORAGE)
             &disk_menu,
 #endif
-            &poweroff,
             &limits_menu,
 #ifdef HAVE_MORSE_INPUT
             &morse_input,