     _e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL);
     return 0;
  }
-@@ -469,8 +469,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
-       case E_SYS_HALT:
+@@ -475,8 +475,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
+       case E_SYS_HALT_NOW:
  	/* shutdown -h now */
  	if (e_util_immortal_check()) return 0;
 -	snprintf(buf, sizeof(buf), "%s/enlightenment_sys halt",

 	if (_e_sys_exe)
 	  {
 	     _e_sys_current_action();
@@ -548,8 +548,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
 	break;
       case E_SYS_HIBERNATE:
 	/* /etc/acpi/hibernate.sh force */

diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -1476,7 +1476,7 @@ _e_fm2_client_spawn(void)
    char buf[4096];
    
    if (_e_fm2_client_spawning) return;
