diff --git a/Makefile b/Makefile
index 9103074..5ffe60b 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,13 @@ install:
 		echo "NOTE: systemd not found, you will need to manually add keyd to your system's init process."; \
 	fi
 
+	@if [ -e /usr/share/libinput/ ]; then \
+		install -m644 keyd.quirks $(DESTDIR)$(PREFIX)/share/libinput/30-keyd.quirks; \
+	else \
+		echo "WARNING: libinput not found, not installing keyd.quirks."; \
+	fi
+
+
 	-groupadd keyd
 	install -m755 bin/keyd $(DESTDIR)$(PREFIX)/bin
 	install -m755 scripts/keyd-application-mapper $(DESTDIR)$(PREFIX)/bin
@@ -52,7 +59,8 @@ install:
 	install -m644 examples/* $(DESTDIR)$(PREFIX)/share/doc/keyd/examples
 
 uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/lib/systemd/system/keyd.service\
+	rm -f $(DESTDIR)$(PREFIX)/share/libinput/30-keyd.quirks\
+		$(DESTDIR)$(PREFIX)/lib/systemd/system/keyd.service\
 		bin/keyd $(DESTDIR)$(PREFIX)/bin/keyd\
 		$(DESTDIR)$(PREFIX)/bin/keyd-application-mapper\
 		$(DESTDIR)$(PREFIX)/share/man/man1/keyd.1.gz
diff --git a/keyd.quirks b/keyd.quirks
new file mode 100644
index 0000000..7856018
--- /dev/null
+++ b/keyd.quirks
@@ -0,0 +1,4 @@
+[keyd]
+MatchUdevType=keyboard
+MatchVendor=0xFAC
+AttrKeyboardIntegration=internal
diff --git a/src/vkbd/uinput.c b/src/vkbd/uinput.c
index c67996b..70e9fcf 100644
--- a/src/vkbd/uinput.c
+++ b/src/vkbd/uinput.c
@@ -48,8 +48,8 @@ static int create_virtual_pointer(const char *name)
 
 	memset(&usetup, 0, sizeof(usetup));
 	usetup.id.bustype = BUS_USB;
-	usetup.id.product = 0x1FAC;
-	usetup.id.vendor = 0x0ADE;
+	usetup.id.vendor = 0x0FAC;
+	usetup.id.product = 0x0ADE;
 	strcpy(usetup.name, name);
 
 	ioctl(fd, UI_DEV_SETUP, &usetup);