--- control.c~	2007-10-26 01:09:15.000000000 +0200
+++ control.c	2007-11-23 12:34:52.000000000 +0100
@@ -447,8 +447,8 @@
 
 	ioctl(fd, UI_SET_KEYBIT, KEY_PLAYPAUSE);
 	ioctl(fd, UI_SET_KEYBIT, KEY_STOP);
-	ioctl(fd, UI_SET_KEYBIT, KEY_NEXT);
-	ioctl(fd, UI_SET_KEYBIT, KEY_PREVIOUS);
+	ioctl(fd, UI_SET_KEYBIT, KEY_NEXTSONG);
+	ioctl(fd, UI_SET_KEYBIT, KEY_PREVIOUSSONG);
 	ioctl(fd, UI_SET_KEYBIT, KEY_REWIND);
 	ioctl(fd, UI_SET_KEYBIT, KEY_FORWARD);
 
@@ -560,11 +560,11 @@
 		break;
 	case NEXT_OP:
 		debug("AVRCP: NEXT %s", status);
-		send_key(session->uinput, KEY_NEXT, pressed);
+		send_key(session->uinput, KEY_NEXTSONG, pressed);
 		break;
 	case PREV_OP:
 		debug("AVRCP: PREV %s", status);
-		send_key(session->uinput, KEY_PREVIOUS, pressed);
+		send_key(session->uinput, KEY_PREVIOUSSONG, pressed);
 		break;
 	case REWIND_OP:
 		debug("AVRCP: REWIND %s", status);
--- bluez-utils-3.22/audio/control.c~	2007-10-26 01:09:15.000000000 +0200
+++ bluez-utils-3.22/audio/control.c	2007-11-23 12:34:52.000000000 +0100
@@ -447,8 +447,8 @@
 
 	ioctl(fd, UI_SET_KEYBIT, KEY_PLAYPAUSE);
 	ioctl(fd, UI_SET_KEYBIT, KEY_STOP);
-	ioctl(fd, UI_SET_KEYBIT, KEY_NEXT);
-	ioctl(fd, UI_SET_KEYBIT, KEY_PREVIOUS);
+	ioctl(fd, UI_SET_KEYBIT, KEY_NEXTSONG);
+	ioctl(fd, UI_SET_KEYBIT, KEY_PREVIOUSSONG);
 	ioctl(fd, UI_SET_KEYBIT, KEY_REWIND);
 	ioctl(fd, UI_SET_KEYBIT, KEY_FORWARD);
 
@@ -560,11 +560,11 @@
 		break;
 	case NEXT_OP:
 		debug("AVRCP: NEXT %s", status);
-		send_key(session->uinput, KEY_NEXT, pressed);
+		send_key(session->uinput, KEY_NEXTSONG, pressed);
 		break;
 	case PREV_OP:
 		debug("AVRCP: PREV %s", status);
-		send_key(session->uinput, KEY_PREVIOUS, pressed);
+		send_key(session->uinput, KEY_PREVIOUSSONG, pressed);
 		break;
 	case REWIND_OP:
 		debug("AVRCP: REWIND %s", status);