diff --git a/common/startup.c b/common/startup.c
index c26bc5f..ecb5691 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -90,7 +90,7 @@
 
 int (*barebox_main)(void);
 
-void start_barebox (void)
+void __noreturn start_barebox(void)
 {
 	initcall_t *initcall;
 	int result;
@@ -162,4 +162,3 @@
 	arch_shutdown();
 #endif
 }
-
diff --git a/include/common.h b/include/common.h
index e858d0a..2c707f7 100644
--- a/include/common.h
+++ b/include/common.h
@@ -165,7 +165,7 @@
  */
 extern int (*barebox_main)(void);
 
-void start_barebox(void);
+void __noreturn start_barebox(void);
 void shutdown_barebox(void);
 
 /*
diff --git a/pbl/misc.c b/pbl/misc.c
index a2cb44d..9065bf0 100644
--- a/pbl/misc.c
+++ b/pbl/misc.c
@@ -14,6 +14,8 @@
 	while(1);
 }
 
-void start_barebox(void)
+void __noreturn start_barebox(void)
 {
+	/* Should never be here in the pbl */
+	hang();
 }