diff --strip-trailing-cr -ru --strip-trailing-cr apps/action.h apps/action.h
--- apps/action.h	2007-02-10 16:21:40.000000000 +0900
+++ apps/action.h	2007-02-17 15:21:32.436771900 +0900
@@ -91,7 +91,8 @@
     ACTION_STD_MENU,
     ACTION_STD_QUICKSCREEN,
     ACTION_STD_KEYLOCK,
-    
+    ACTION_STD_VOLUP,
+    ACTION_STD_VOLDOWN,
     ACTION_F3, /* just so everything works again, possibly change me */
     /* code context actions */
     
diff --strip-trailing-cr -ru --strip-trailing-cr apps/keymaps/keymap-gigabeat.c apps/keymaps/keymap-gigabeat.c
--- apps/keymaps/keymap-gigabeat.c	2007-02-10 15:36:34.000000000 +0900
+++ apps/keymaps/keymap-gigabeat.c	2007-02-17 15:19:56.374171900 +0900
@@ -60,6 +60,10 @@
     { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_SELECT },
     { ACTION_STD_OK,            BUTTON_RIGHT,               BUTTON_NONE },
     { ACTION_STD_OK,            BUTTON_POWER|BUTTON_REL,       BUTTON_NONE },
+    { ACTION_STD_VOLDOWN,       BUTTON_VOL_DOWN,                BUTTON_NONE },
+    { ACTION_STD_VOLDOWN,       BUTTON_VOL_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_STD_VOLUP,         BUTTON_VOL_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_STD_VOLUP,         BUTTON_VOL_UP,                      BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
diff --strip-trailing-cr -ru --strip-trailing-cr apps/menu.c apps/menu.c
--- apps/menu.c	2007-02-10 17:21:48.000000000 +0900
+++ apps/menu.c	2007-02-17 15:39:34.823771900 +0900
@@ -468,6 +468,16 @@
         {
             talk_menu_item(menu, &lists);
         }
+        else if (action == ACTION_STD_VOLUP)
+        {
+                global_settings.volume++;
+                setvol();
+        }
+        else if (action == ACTION_STD_VOLDOWN)
+        {
+                global_settings.volume--;
+                setvol();
+        }
         else if (action == ACTION_MENU_WPS)
         {
             ret = GO_TO_PREVIOUS_MUSIC;
diff --strip-trailing-cr -ru --strip-trailing-cr apps/tree.c apps/tree.c
--- apps/tree.c	2007-02-18 18:06:08.183800000 +0900
+++ apps/tree.c	2007-02-17 15:30:22.059371900 +0900
@@ -664,6 +664,16 @@
                 restore = true;
                 break;
 
+            case ACTION_STD_VOLUP:
+                global_settings.volume++;
+                setvol();
+                break;
+
+            case ACTION_STD_VOLDOWN:
+                global_settings.volume--;
+                setvol();
+                break;
+
             case ACTION_TREE_STOP:
                 if (*tc.dirfilter < NUM_FILTER_MODES)
                 {