Index: apps/keymaps/keymap-gigabeat.c
===================================================================
--- apps/keymaps/keymap-gigabeat.c	(revision 13403)
+++ apps/keymaps/keymap-gigabeat.c	(working copy)
@@ -66,7 +66,7 @@
 
 
 static const struct button_mapping button_context_wps[]  = {
-    { ACTION_WPS_PLAY,          BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT },
+    { ACTION_WPS_PLAY,          BUTTON_A|BUTTON_REL,           BUTTON_A },
     { ACTION_WPS_STOP,          BUTTON_POWER|BUTTON_REL,          BUTTON_POWER },
 
     { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
@@ -98,7 +98,7 @@
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
     { ACTION_WPS_ID3SCREEN,     BUTTON_A|BUTTON_MENU,          BUTTON_NONE },
-    { ACTION_WPS_BROWSE,        BUTTON_A|BUTTON_REL,       BUTTON_A },
+    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
Index: firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
===================================================================
--- firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c	(revision 13403)
+++ firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c	(working copy)
@@ -33,8 +33,8 @@
 static int const remote_buttons[] =
 {
     BUTTON_NONE,    /* Headphones connected - remote disconnected */
-    BUTTON_SELECT,
-    BUTTON_MENU,    /* could be changed to BUTTON_A */
+    BUTTON_A,
+    BUTTON_MENU,    /* could be changed to BUTTON_SELECT */
     BUTTON_LEFT,
     BUTTON_RIGHT,
     BUTTON_UP,      /* could be changed to BUTTON_VOL_UP */