diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 58bf218428b4..182fe7e98e1a 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -39,7 +39,7 @@ trap 'fail' ERR
 
 # Print a greeting.
 echo
-echo "<<< NixOS Stage 1 >>>"
+echo "<<< NixOS Stage 1 >>>"
 echo
 
 
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 5e1a2104ca3b..30298c3127fd 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -5,7 +5,7 @@
 
 # Print a greeting.
 echo
-echo "<<< NixOS Stage 2 >>>"
+echo -e "\e[1;32m<<< NixOS Stage 2 >>>\e[0m"
 echo
 
 
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 9c2359c0ff8c..fa264979c6c0 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -19,7 +19,11 @@ with pkgs.lib;
       
           exec < /dev/console > /dev/console 2>&1
           echo ""
-          echo "<<< SYSTEM SHUTDOWN >>>"
+          if test "$MODE" = maintenance; then
+              echo "<<< Entering maintenance mode >>>"
+          else
+              echo "<<< System shutdown >>>"
+          fi
           echo ""
       
           export PATH=${pkgs.utillinux}/bin:${pkgs.utillinux}/sbin:$PATH
@@ -58,7 +62,7 @@ with pkgs.lib;
           # back up.
           if test "$MODE" = maintenance; then
               echo ""
-              echo "<<< MAINTENANCE SHELL >>>"
+              echo "<<< Maintenance shell >>>"
               echo ""
               while ! ${pkgs.bash}/bin/bash --login; do true; done
               initctl emit -n startup
@@ -121,8 +125,7 @@ with pkgs.lib;
           sync
       
       
-          # Either reboot or power-off the system.  Note that the "halt"
-          # event also does a power-off.
+          # Either reboot or power-off the system.
           if test "$MODE" = reboot; then
               echo "rebooting..."
               sleep 1