diff --git a/apps/main.c b/apps/main.c
index 677eeb5b21..1eed068f14 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -127,7 +127,8 @@ static void init(void);
 #ifdef SIMULATOR
 void app_main(void)
 #else
-static void app_main(void)
+int main(void) __attribute__((noreturn));
+int main(void)
 #endif
 {
     int i;
@@ -640,17 +641,5 @@ void cop_main(void)
 }
 #endif /* CPU_PP */
 
-int main(void)
-{
-    app_main();
-
-    while(1) {
-#if (CONFIG_LED == LED_REAL)
-        led(true); sleep(HZ/10);
-        led(false); sleep(HZ/10);
-#endif
-    }
-    return 0;
-}
 #endif
 
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 3ca4510ae4..b02d2a1be8 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -595,5 +595,4 @@ void root_menu(void)
                 break;
         } /* switch() */
     }
-    return;
 }
diff --git a/apps/root_menu.h b/apps/root_menu.h
index 584e048a53..10904829d1 100644
--- a/apps/root_menu.h
+++ b/apps/root_menu.h
@@ -22,7 +22,7 @@
 #ifndef __ROOT_MENU_H__
 #define __ROOT_MENU_H__
 
-void root_menu(void);
+void root_menu(void) __attribute__((noreturn));
 
 enum {
     /* from old menu api, but still required*/