Index: apps/action.c
===================================================================
--- apps/action.c	(revision 15409)
+++ apps/action.c	(working copy)
@@ -28,6 +28,8 @@
 #include "kernel.h"
 #include "debug.h"
 #include "splash.h"
+#include "settings.h"
+#include "pcmbuf.h"
 
 static int last_button = BUTTON_NONE|BUTTON_REL; /* allow the ipod wheel to 
                                                     work on startup */
@@ -123,7 +125,11 @@
     {
         return button;
     }
-    
+
+    /* Produce keyclick */
+    if((button & (BUTTON_REL | BUTTON_REPEAT)) == 0 && global_settings.beep)
+        pcmbuf_beep(5000, 3, 2500*global_settings.beep);
+
     if ((context != last_context) && ((last_button&BUTTON_REL) == 0))
     {
         if (button&BUTTON_REL)
Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(revision 15409)
+++ apps/lang/english.lang	(working copy)
@@ -1959,20 +1959,20 @@
   user:
   <source>
     *: none
-    swcodec: "Beep Volume"
+    swcodec: "Keyclick Volume"
   </source>
   <dest>
     *: none
-    swcodec: "Beep Volume"
+    swcodec: "Keyclick Volume"
   </dest>
   <voice>
     *: none
-    swcodec: "Beep Volume"
+    swcodec: "Key click Volume"
   </voice>
 </phrase>
 <phrase>
   id: LANG_WEAK
-  desc: in beep volume in playback settings
+  desc: in keyclick volume in playback settings
   user:
   <source>
     *: none
@@ -1989,7 +1989,7 @@
 </phrase>
 <phrase>
   id: LANG_MODERATE
-  desc: in beep volume in playback settings
+  desc: in keyclick volume in playback settings
   user:
   <source>
     *: none
@@ -2006,7 +2006,7 @@
 </phrase>
 <phrase>
   id: LANG_STRONG
-  desc: in beep volume in playback settings
+  desc: in keyclick volume in playback settings
   user:
   <source>
     *: none
Index: apps/playback.c
===================================================================
--- apps/playback.c	(revision 15409)
+++ apps/playback.c	(working copy)
@@ -741,9 +741,6 @@
 {
     if (playlist_check(ci.new_track + wps_offset + 1))
     {
-        if (global_settings.beep)
-            pcmbuf_beep(5000, 100, 2500*global_settings.beep);
-
         LOGFQUEUE("audio > audio Q_AUDIO_SKIP 1");
         queue_post(&audio_queue, Q_AUDIO_SKIP, 1);
         /* Update wps while our message travels inside deep playback queues. */
@@ -762,9 +759,6 @@
 {
     if (playlist_check(ci.new_track + wps_offset - 1))
     {
-        if (global_settings.beep)
-            pcmbuf_beep(5000, 100, 2500*global_settings.beep);
-
         LOGFQUEUE("audio > audio Q_AUDIO_SKIP -1");
         queue_post(&audio_queue, Q_AUDIO_SKIP, -1);
         /* Update wps while our message travels inside deep playback queues. */