diff --git a/src/keyboard.h b/src/keyboard.h
index 91f1a26dd..39c474c4f 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -8,15 +8,15 @@
  *
  *		Definitions for the keyboard interface.
  *
- * Version:	@(#)keyboard.h	1.0.7	2017/12/31
+ * Version:	@(#)keyboard.h	1.0.8	2018/01/04
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
  *
- *		Copyright 2008-2017 Sarah Walker.
- *		Copyright 2016,2017 Miran Grca.
- *		Copyright 2017 Fred N. van Kempen.
+ *		Copyright 2008-2018 Sarah Walker.
+ *		Copyright 2016,2018 Miran Grca.
+ *		Copyright 2018 Fred N. van Kempen.
  */
 #ifndef EMU_KEYBOARD_H
 # define EMU_KEYBOARD_H
@@ -51,11 +51,11 @@ extern device_t	keyboard_xt_device;
 extern device_t	keyboard_tandy_device;
 extern device_t	keyboard_at_device;
 extern device_t	keyboard_at_ami_device;
-extern device_t	keyboard_at_quadtel_device;
 extern device_t	keyboard_at_toshiba_device;
 extern device_t	keyboard_ps2_device;
 extern device_t	keyboard_ps2_ami_device;
 extern device_t	keyboard_ps2_mca_device;
+extern device_t	keyboard_ps2_quadtel_device;
 #endif
 
 extern void	keyboard_init(void);
diff --git a/src/keyboard_at.c b/src/keyboard_at.c
index 73632496c..323f1665e 100644
--- a/src/keyboard_at.c
+++ b/src/keyboard_at.c
@@ -8,7 +8,7 @@
  *
  *		Intel 8042 (AT keyboard controller) emulation.
  *
- * Version:	@(#)keyboard_at.c	1.0.15	2018/01/04
+ * Version:	@(#)keyboard_at.c	1.0.16	2018/01/04
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -1556,16 +1556,6 @@ device_t keyboard_at_ami_device = {
     NULL, NULL, NULL, NULL
 };
 
-device_t keyboard_at_quadtel_device = {
-    "PC/AT Keyboard (Quadtel/MegaPC)",
-    0,
-    KBC_TYPE_ISA | KBC_VEN_QUADTEL,
-    kbd_init,
-    kbd_close,
-    kbd_reset,
-    NULL, NULL, NULL, NULL
-};
-
 device_t keyboard_at_toshiba_device = {
     "PC/AT Keyboard (Toshiba)",
     0,
@@ -1606,6 +1596,16 @@ device_t keyboard_ps2_mca_device = {
     NULL, NULL, NULL, NULL
 };
 
+device_t keyboard_ps2_quadtel_device = {
+    "PS/2 Keyboard (Quadtel/MegaPC)",
+    0,
+    KBC_TYPE_PS2_1 | KBC_VEN_QUADTEL,
+    kbd_init,
+    kbd_close,
+    kbd_reset,
+    NULL, NULL, NULL, NULL
+};
+
 
 void
 keyboard_at_reset(void)
diff --git a/src/machine/m_at_wd76c10.c b/src/machine/m_at_wd76c10.c
index 8df1539ef..18096a408 100644
--- a/src/machine/m_at_wd76c10.c
+++ b/src/machine/m_at_wd76c10.c
@@ -142,7 +142,7 @@ void
 machine_at_wd76c10_init(machine_t *model)
 {
         machine_at_common_ide_init(model);
-	device_add(&keyboard_at_quadtel_device);
+	device_add(&keyboard_ps2_quadtel_device);
 
         wd76c10_init();