diff --git a/ChangeLog b/ChangeLog
index a2a8609ab..f62cc0ba6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Add noreturn attributes and remove unreachable code.
+
+	* grub-core/bus/cs5536.c (grub_cs5536_smbus_wait): Remove unreachable
+	code.
+	* grub-core/commands/halt.c (grub_cmd_halt): Remove unreachable
+	code. Mark as noreturn.
+	* grub-core/commands/minicmd.c (grub_mini_cmd_exit): Likewise.
+	* grub-core/commands/reboot.c (grub_cmd_reboot): Likewise.
+	* grub-core/disk/efi/efidisk.c (grub_efidisk_get_device_name): Remove
+	unreachable code.
+	* grub-core/kern/main.c (grub_main): Mark as noreturn.
+	* grub-core/kern/rescue_reader.c (grub_rescue_run): Likewise.
+	* grub-core/lib/posix_wrap/stdlib.h (abort): Likewise.
+	* grub-core/normal/menu.c (run_menu): Remove unreachable code.
+	* include/grub/kernel.h (grub_main): Mark as noreturn.
+	* include/grub/reader.h (grub_rescue_run): Likewise.
+
 2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/i386/qemu/memory.h (grub_machine_mmap_init): Remove
diff --git a/grub-core/bus/cs5536.c b/grub-core/bus/cs5536.c
index 1aae7852e..9e7796ea1 100644
--- a/grub-core/bus/cs5536.c
+++ b/grub-core/bus/cs5536.c
@@ -97,8 +97,6 @@ grub_cs5536_smbus_wait (grub_port_t smbbase)
       if (grub_get_time_ms () > start + 40)
 	return grub_error (GRUB_ERR_IO, "SM stalled");
     }
-
-  return GRUB_ERR_NONE;
 }
 
 grub_err_t
diff --git a/grub-core/commands/halt.c b/grub-core/commands/halt.c
index 317f7753f..f8596ecdc 100644
--- a/grub-core/commands/halt.c
+++ b/grub-core/commands/halt.c
@@ -24,13 +24,12 @@
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
-static grub_err_t
+static grub_err_t __attribute__ ((noreturn))
 grub_cmd_halt (grub_command_t cmd __attribute__ ((unused)),
 	       int argc __attribute__ ((unused)),
 	       char **args __attribute__ ((unused)))
 {
   grub_halt ();
-  return 0;
 }
 
 static grub_command_t cmd;
diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
index 1bb0147df..f436cd55d 100644
--- a/grub-core/commands/minicmd.c
+++ b/grub-core/commands/minicmd.c
@@ -165,13 +165,13 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
 }
 
 /* exit */
-static grub_err_t
+static grub_err_t __attribute__ ((noreturn))
 grub_mini_cmd_exit (struct grub_command *cmd __attribute__ ((unused)),
 		    int argc __attribute__ ((unused)),
 		    char *argv[] __attribute__ ((unused)))
 {
   grub_exit ();
-  return 0;
+  /* Not reached.  */
 }
 
 static grub_command_t cmd_cat, cmd_help;
diff --git a/grub-core/commands/reboot.c b/grub-core/commands/reboot.c
index 8e18083c0..46d364c99 100644
--- a/grub-core/commands/reboot.c
+++ b/grub-core/commands/reboot.c
@@ -24,13 +24,12 @@
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
-static grub_err_t
+static grub_err_t __attribute__ ((noreturn))
 grub_cmd_reboot (grub_command_t cmd __attribute__ ((unused)),
 		 int argc __attribute__ ((unused)),
 		 char **args __attribute__ ((unused)))
 {
   grub_reboot ();
-  return 0;
 }
 
 static grub_command_t cmd;
diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
index 0baeb8e4b..bbb8c93b1 100644
--- a/grub-core/disk/efi/efidisk.c
+++ b/grub-core/disk/efi/efidisk.c
@@ -791,6 +791,4 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
       grub_disk_close (parent);
       return device_name;
     }
-
-  return 0;
 }
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
index bf2789860..185230c5c 100644
--- a/grub-core/kern/main.c
+++ b/grub-core/kern/main.c
@@ -190,7 +190,7 @@ grub_load_normal_mode (void)
 }
 
 /* The main routine.  */
-void
+void __attribute__ ((noreturn))
 grub_main (void)
 {
   /* First of all, initialize the machine.  */
diff --git a/grub-core/kern/rescue_reader.c b/grub-core/kern/rescue_reader.c
index a81008579..4587b944f 100644
--- a/grub-core/kern/rescue_reader.c
+++ b/grub-core/kern/rescue_reader.c
@@ -74,7 +74,7 @@ grub_rescue_read_line (char **line, int cont)
   return 0;
 }
 
-void
+void __attribute__ ((noreturn))
 grub_rescue_run (void)
 {
   grub_printf ("Entering rescue mode...\n");
diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h
index 4c725f6e2..b35e21bb8 100644
--- a/grub-core/lib/posix_wrap/stdlib.h
+++ b/grub-core/lib/posix_wrap/stdlib.h
@@ -46,7 +46,7 @@ realloc (void *ptr, grub_size_t size)
   return grub_realloc (ptr, size);
 }
 
-static inline void
+static inline void __attribute__ ((noreturn))
 abort (void)
 {
   grub_abort ();
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
index b75e9f523..ae8e3e681 100644
--- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c
@@ -666,7 +666,6 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
     }
 
   /* Never reach here.  */
-  return -1;
 }
 
 /* Callback invoked immediately before a menu entry is executed.  */
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index f9fc817db..f587de514 100644
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -82,7 +82,7 @@ extern grub_addr_t EXPORT_VAR (grub_modbase);
 grub_addr_t grub_modules_get_end (void);
 
 /* The start point of the C code.  */
-void grub_main (void);
+void grub_main (void) __attribute__ ((noreturn));
 
 /* The machine-specific initialization. This must initialize memory.  */
 void grub_machine_init (void);
diff --git a/include/grub/reader.h b/include/grub/reader.h
index fd72a3252..cd92df8f2 100644
--- a/include/grub/reader.h
+++ b/include/grub/reader.h
@@ -24,6 +24,6 @@
 
 typedef grub_err_t (*grub_reader_getline_t) (char **, int);
 
-void grub_rescue_run (void);
+void grub_rescue_run (void) __attribute__ ((noreturn));
 
 #endif /* ! GRUB_READER_HEADER */