Index: firmware/drivers/button.c
===================================================================
--- firmware/drivers/button.c	(revision 24134)
+++ firmware/drivers/button.c	(working copy)
@@ -199,7 +199,7 @@
                            which doesn't shut down easily with the OFF
                            key */
 #ifdef HAVE_SW_POWEROFF
-                        if ((btn == POWEROFF_BUTTON
+                        if ((btn & POWEROFF_BUTTON
 #ifdef RC_POWEROFF_BUTTON
                                     || btn == RC_POWEROFF_BUTTON
 #endif