diff --git a/kernel/trunk/boot/bootcode.inc b/kernel/trunk/boot/bootcode.inc
index 5a54b9a261..750ca5a13a 100644
--- a/kernel/trunk/boot/bootcode.inc
+++ b/kernel/trunk/boot/bootcode.inc
@@ -731,6 +731,8 @@ end if
         or      al, 20h
         cmp     al, 'a'
         jz      .change_a
+        cmp     al, 'q'         ; Trick to make 'A' key on azerty keyboard work
+        je      .change_a
         cmp     al, 'b'
         jz      .change_b
 ;        cmp     al, 'c'