diff --git a/tools/event-debug.c b/tools/event-debug.c
index 23e6cf92..ece58888 100644
--- a/tools/event-debug.c
+++ b/tools/event-debug.c
@@ -255,12 +255,18 @@ print_button_event(struct libinput_event *ev)
 {
 	struct libinput_event_pointer *p = libinput_event_get_pointer_event(ev);
 	enum libinput_button_state state;
+	const char *buttonname;
+	int button;
 
 	print_event_time(libinput_event_pointer_get_time(p));
 
+	button = libinput_event_pointer_get_button(p);
+	buttonname = libevdev_event_code_get_name(EV_KEY, button);
+
 	state = libinput_event_pointer_get_button_state(p);
-	printf("%3d %s, seat count: %u\n",
-	       libinput_event_pointer_get_button(p),
+	printf("%s (%d) %s, seat count: %u\n",
+	       buttonname ? buttonname : "???",
+	       button,
 	       state == LIBINPUT_BUTTON_STATE_PRESSED ? "pressed" : "released",
 	       libinput_event_pointer_get_seat_button_count(p));
 }