diff --git a/FIRMWARE.md b/FIRMWARE.md
index feb6258..13dd864 100644
--- a/FIRMWARE.md
+++ b/FIRMWARE.md
@@ -178,16 +178,6 @@ As far as the testing done goes, they do not cause any harm to the normal
 operation of the booted system, while being a net upgrade over the previous
 firmware which had no way for the user to select boot options via the device.
 
-### Keyboard input is *wonky*
-
-I do not know how to better describe it. Sometimes the input is immediate,
-sometimes it will take a hot second before it happens. I recommend pressing
-an arrow key once and waiting up to 5 seconds (usually 2) when navigating the
-menu. Otherwise you may overshoot if you are impatient.
-
-It may also be worsened by mixing serial input and keyboard input, but has not
-been conclusively validated.
-
 ### Saving settings to SPI
 
 While there is a patch upstream to do so, it seems to cause issues with USB
diff --git a/u-boot/0006-configure-usb-kbd-polling.patch b/u-boot/0006-configure-usb-kbd-polling.patch
new file mode 100644
index 0000000..1267ae0
--- /dev/null
+++ b/u-boot/0006-configure-usb-kbd-polling.patch
@@ -0,0 +1,22 @@
+configs/pinebook-pro-rk3399_defconfig: Configure usb kbd polling
+
+The default configuration will use SYS_USB_EVENT_POLL for handling the
+usb keyboard and it makes the system really slow (eg slow keypress, 
+loading kernel/initrd from grub-efi is taking ages).
+
+Using CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE seems to be improving
+things a lot, so use it.
+
+Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
+Index: u-boot/configs/pinebook-pro-rk3399_defconfig
+===================================================================
+--- u-boot.orig/configs/pinebook-pro-rk3399_defconfig
++++ u-boot/configs/pinebook-pro-rk3399_defconfig
+@@ -78,6 +78,7 @@ CONFIG_USB_OHCI_GENERIC=y
+ CONFIG_USB_DWC3=y
+ CONFIG_ROCKCHIP_USB2_PHY=y
+ CONFIG_USB_KEYBOARD=y
++CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+ CONFIG_USB_HOST_ETHER=y
+ CONFIG_USB_ETHER_ASIX=y
+ CONFIG_USB_ETHER_RTL8152=y
diff --git a/u-boot/default.nix b/u-boot/default.nix
index af41eb3..479921c 100644
--- a/u-boot/default.nix
+++ b/u-boot/default.nix
@@ -17,7 +17,7 @@ let
   };
 
   # The version number for our opinionated firmware.
-  firmwareVersion = "002";
+  firmwareVersion = "003";
 
   logo = runCommandNoCC "pbp-logo" {} ''
     mkdir -p $out
@@ -68,6 +68,7 @@ in
     # I have been authorised to distribute.
     #
     ./0001-display-support.patch
+    ./0006-configure-usb-kbd-polling.patch
 
     # Dhivael patchset
     # ----------------