diff --git a/machine.c b/machine.c
index 597ec18..0220b0c 100644
--- a/machine.c
+++ b/machine.c
@@ -1,8 +1,8 @@
 #include "machine.h"
 
-#ifdef MACHINE_KL_9000_6XHML_X2
+#ifdef MACHINE_KP_9000_6XHML_X2
 __code const struct machine machine = {
-	.machine_name = "keepLink KL-9000-6XHML-X2",
+	.machine_name = "keepLink KP-9000-6XHML-X2",
 	.isRTL8373 = 0,
 	.min_port = 3,
 	.max_port = 8,
@@ -10,18 +10,47 @@ __code const struct machine machine = {
 	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
 	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
 	.is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = 45,
-	.sfp_port[0].pin_los = 21,
+	.sfp_port[0].pin_detect = 50,
+	.sfp_port[0].pin_los = 10,
 	.sfp_port[0].sds = 1,
 	.sfp_port[0].i2c = 1,
-	.sfp_port[1].pin_detect = 1,
-	.sfp_port[1].pin_los = 58,
+	.sfp_port[1].pin_detect = 30,
+	.sfp_port[1].pin_los = 37,
 	.sfp_port[1].sds = 0,
 	.sfp_port[1].i2c = 0,
-	.reset_pin = 49,
+	.reset_pin = 46,
 };
-
-#elif MACHINE_SWGT024_V2_0
+#elif defined MACHINE_KP_9000_6XH_X
+__code const struct machine machine = {
+	.machine_name = "keepLink KP-9000-6XH-X",
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
+	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = 30,
+	.sfp_port[0].pin_los = 37,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = 0,
+};
+#elif defined MACHINE_KP_9000_9XH_X_EU
+__code const struct machine machine = {
+	.machine_name = "keepLink KP-9000-6XH-X-EU",
+	.isRTL8373 = 1,
+	.min_port = 0,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
+	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = 30,
+	.sfp_port[0].pin_los = 37,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = 0,
+};
+#elif defined MACHINE_SWGT024_V2_0
 __code const struct machine machine = {
 	.machine_name = "SWGT024 V2.0",
 	.isRTL8373 = 0,
@@ -40,19 +69,20 @@ __code const struct machine machine = {
 	.sfp_port[1].sds = 0,
 	.sfp_port[1].i2c = 0,
 };
-#elif DEFAULT_8C_1SFP
+#elif defined DEFAULT_8C_1SFP
 __code const struct machine machine = {
-	.machine_name = "9-Port Switch",
+	.machine_name = "8+1 SFP Port Switch",
 	.isRTL8373 = 1,
 	.min_port = 0,
 	.max_port = 8,
 	.n_sfp = 1,
 	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
 	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
-	.is_sfp= {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = 1,
-	.sfp_port[0].pin_los = 58,
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = 30,
+	.sfp_port[0].pin_los = 37,
 	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = 0,
 };
 
 #endif
diff --git a/machine.h b/machine.h
index a5400a4..aa518bd 100644
--- a/machine.h
+++ b/machine.h
@@ -6,7 +6,9 @@
 /*
  * Select your machine type below
  */
-#define MACHINE_KL_9000_6XHML_X2
+#define MACHINE_KP_9000_6XHML_X2
+// #define MACHINE_KP_9000_6XH_X
+// #define MACHINE_KP_9000_9XH_X_EU
 // #define MACHINE_SWGT024_V2_0
 // #define MACHINE_HORACO_ZX_SG4T2