diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 9914b16..e5582da 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -6617,19 +6617,16 @@
 </phrase>
 <phrase>
   id: LANG_SHUTDOWN
-  desc: in main menu
+  desc: used in the main menu
   user: core
   <source>
-    *: none
-    soft_shutdown: "Shut down"
+    *: "Shut down"
   </source>
   <dest>
-    *: none
-    soft_shutdown: "Shut down"
+    *: "Shut down"
   </dest>
   <voice>
-    *: none
-    soft_shutdown: "Shut down"
+    *: "Shut down"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/root_menu.c b/apps/root_menu.c
index c94a444..f518897 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -468,7 +468,12 @@ MENUITEM_RETURNVALUE(playlists, ID2P(LANG_CATALOG), GO_TO_PLAYLISTS_SCREEN,
 MENUITEM_RETURNVALUE(system_menu_, ID2P(LANG_SYSTEM), GO_TO_SYSTEM_SCREEN,
                      NULL, Icon_System_menu);

-#if CONFIG_KEYPAD == PLAYER_PAD
+#ifdef HAVE_SHUTDOWN_IN_MAIN_MENU
+#define SHUTDOWN_PREFIX ""
+#else
+#define SHUTDOWN_PREFIX "!"
+#endif
+
 static int do_shutdown(void)
 {
 #if CONFIG_CHARGING
@@ -481,12 +486,13 @@ static int do_shutdown(void)
 }
 MENUITEM_FUNCTION(do_shutdown_item, 0, ID2P(LANG_SHUTDOWN),
                   do_shutdown, NULL, NULL, Icon_NOICON);
-#endif

 struct menu_item_ex root_menu_;
 static struct menu_callback_with_desc root_menu_desc = {
         item_callback, ID2P(LANG_ROCKBOX_TITLE), Icon_Rockbox };

+/* If an item starts with '!' it wont be added to the menu
+   by default but remains accessible to the target*/
 static struct menu_table menu_table[] = {
     /* Order here represents the default ordering */
     { "bookmarks", &bookmarks },
@@ -505,10 +511,8 @@ static struct menu_table menu_table[] = {
     { "playlists", &playlists },
     { "plugins", &rocks_browser },
     { "system_menu", &system_menu_ },
-#if CONFIG_KEYPAD == PLAYER_PAD
-    { "shutdown", &do_shutdown_item },
-#endif
     { "shortcuts", &shortcut_menu },
+    { SHUTDOWN_PREFIX "shutdown", &do_shutdown_item },
 };
 #define MAX_MENU_ITEMS (sizeof(menu_table) / sizeof(struct menu_table))
 static struct menu_item_ex *root_menu__[MAX_MENU_ITEMS];
@@ -549,7 +553,10 @@ void root_menu_load_from_cfg(void* setting, char *value)
             *end = '\0';
         for (i=0; i<MAX_MENU_ITEMS; i++)
         {
-            if (*start && !strcmp(start, menu_table[i].string))
+            char *string = menu_table[i].string;
+            if (string[0] == '!')
+                string++;
+            if (*start && !strcmp(start, string))
             {
                 root_menu__[menu_item_count++] = (struct menu_item_ex *)menu_table[i].item;
                 if (menu_table[i].item == &menu_)
@@ -574,7 +581,10 @@ char* root_menu_write_to_cfg(void* setting, char*buf, int buf_len)
         {
             if (menu_table[j].item == root_menu__[i])
             {
-                written = snprintf(buf, buf_len, "%s, ", menu_table[j].string);
+                char *out = menu_table[j].string;
+                if (out[0] == '!')
+                    out++;
+                written = snprintf(buf, buf_len, "%s,", out);
                 buf_len -= written;
                 buf += written;
                 break;
@@ -586,7 +596,7 @@ char* root_menu_write_to_cfg(void* setting, char*buf, int buf_len)

 void root_menu_set_default(void* setting, void* defaultval)
 {
-    unsigned i;
+    unsigned i, count = 0;
     (void)defaultval;

     root_menu_.flags = MENU_HAS_DESC | MT_MENU;
@@ -595,9 +605,13 @@ void root_menu_set_default(void* setting, void* defaultval)

     for (i=0; i<MAX_MENU_ITEMS; i++)
     {
-        root_menu__[i] = (struct menu_item_ex *)menu_table[i].item;
+        if (menu_table[i].string[0] != '!')
+        {
+            root_menu__[count] = (struct menu_item_ex *)menu_table[i].item;
+            count++;
+        }
     }
-    root_menu_.flags |= MENU_ITEM_COUNT(MAX_MENU_ITEMS);
+    root_menu_.flags |= MENU_ITEM_COUNT(count);
     *(bool*)setting = false;
 }

diff --git a/firmware/export/config/android.h b/firmware/export/config/android.h
index 2aee700..f380b67 100644
--- a/firmware/export/config/android.h
+++ b/firmware/export/config/android.h
@@ -107,3 +107,6 @@
 /* No special storage */
 #define CONFIG_STORAGE STORAGE_HOSTFS
 #define HAVE_STORAGE_FLUSH
+
+/* Define this if the target is to have Shut Down in the Main Menu by default */
+#define HAVE_SHUTDOWN_IN_MAIN_MENU
diff --git a/firmware/export/config/archosplayer.h b/firmware/export/config/archosplayer.h
index 2e0219c..990fa8a 100644
--- a/firmware/export/config/archosplayer.h
+++ b/firmware/export/config/archosplayer.h
@@ -109,3 +109,6 @@

 /* Define this if a programmable hotkey is mapped */
 #define HAVE_HOTKEY
+
+/* Define this if the target is to have Shut Down in the Main Menu by default */
+#define HAVE_SHUTDOWN_IN_MAIN_MENU
diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index efd3361..7bc96ee 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -14,7 +14,7 @@ To accomplish this, load a \fname{.cfg} file (as described in
 words: \config{bookmarks}, \config{files}, \opt{tagcache}{\config{database}, }%
 \config{wps}, \config{settings}, \opt{recording}{\config{recording}, }%
 \opt{radio}{\config{radio}, }\config{playlists}, \config{plugins},
-\config{system\_menu}, \opt{PLAYER_PAD}{\config{shutdown}, }\config{shortcuts}.
+\config{system\_menu}, \config{shortcuts}, \config{shutdown}.
 Each of the words, if it occurs in the list, activates the appropriate item
 in the main menu. The order of the items is given by the order of the words
 in the list. The items whose words do not occur in the list will be hidden,