***************
*** 723,729 ****
      (CONFIG_BATTERY!=BATT_1AA)
              if (!shutdown_timeout &&
                  (battery_centivolts < battery_level_shutoff[battery_type]))
-                 sys_poweroff();
              else
  #endif
                  avgbat += battery_centivolts * 10000
--- 723,729 ----
      (CONFIG_BATTERY!=BATT_1AA)
              if (!shutdown_timeout &&
                  (battery_centivolts < battery_level_shutoff[battery_type]))
+                 sys_poweroff(false);
              else
  #endif
                  avgbat += battery_centivolts * 10000
***************
*** 1127,1133 ****
          shutdown_timeout += HZ*20;
      }
  
-     queue_post(&button_queue, SYS_POWEROFF, 0);
  }
  
  void cancel_shutdown(void)
--- 1127,1136 ----
          shutdown_timeout += HZ*20;
      }
  
+     if (reboot)
+         queue_post(&button_queue, SYS_REBOOT, 0);
+     else
+         queue_post(&button_queue, SYS_POWEROFF, 0);
  }
  
  void cancel_shutdown(void)