diff --git a/tools/Makefile.am b/tools/Makefile.am
index b24c560d..68e60cbb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -13,9 +13,9 @@ libshared_la_CFLAGS = $(LIBEVDEV_CFLAGS)
 libshared_la_LIBADD = $(LIBEVDEV_LIBS)
 
 event_debug_SOURCES = event-debug.c
-event_debug_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS)
+event_debug_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS)
 event_debug_LDFLAGS = -no-install
-event_debug_CFLAGS = $(LIBUDEV_CFLAGS)
+event_debug_CFLAGS = $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS)
 
 ptraccel_debug_SOURCES = ptraccel-debug.c
 ptraccel_debug_LDADD = ../src/libfilter.la
diff --git a/tools/event-debug.c b/tools/event-debug.c
index 3629e745..cbbd978f 100644
--- a/tools/event-debug.c
+++ b/tools/event-debug.c
@@ -34,6 +34,7 @@
 #include <sys/ioctl.h>
 
 #include <libinput.h>
+#include <libevdev/libevdev.h>
 
 #include "shared.h"
 
@@ -193,11 +194,17 @@ print_key_event(struct libinput_event *ev)
 {
 	struct libinput_event_keyboard *k = libinput_event_get_keyboard_event(ev);
 	enum libinput_key_state state;
+	uint32_t key;
+	const char *keyname;
 
 	print_event_time(libinput_event_keyboard_get_time(k));
 	state = libinput_event_keyboard_get_key_state(k);
-	printf("%d %s\n",
-	       libinput_event_keyboard_get_key(k),
+
+	key = libinput_event_keyboard_get_key(k);
+	keyname = libevdev_event_code_get_name(EV_KEY, key);
+	printf("%s (%d) %s\n",
+	       keyname ? keyname : "???",
+	       key,
 	       state == LIBINPUT_KEY_STATE_PRESSED ? "pressed" : "released");
 }