diff --git a/converter/pc98_usb/Makefile b/converter/pc98_usb/Makefile
index 9892276d..ae6511cd 100644
--- a/converter/pc98_usb/Makefile
+++ b/converter/pc98_usb/Makefile
@@ -10,7 +10,6 @@ TARGET_DIR = .
 # keyboard dependent files
 SRC =	keymap.c \
 	matrix.c \
-	led.c \
 	protocol/serial_uart.c
 #	protocol/serial_soft.c
 
diff --git a/converter/pc98_usb/config.h b/converter/pc98_usb/config.h
index b8d676e4..16a54ca5 100644
--- a/converter/pc98_usb/config.h
+++ b/converter/pc98_usb/config.h
@@ -36,6 +36,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 )
 
 
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Control LED indicatiors, which doesn't work well with locking support */
+//#define PC98_LED_CONTROL
+
+
 /* PC98 Reset Port shared with TXD */
 #define PC98_RST_DDR    DDRD
 #define PC98_RST_PORT   PORTD
diff --git a/converter/pc98_usb/led.c b/converter/pc98_usb/led.c
deleted file mode 100644
index 48c3f1c2..00000000
--- a/converter/pc98_usb/led.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "stdint.h"
-#include "serial.h"
-#include "led.h"
-
-
-void led_set(uint8_t usb_led)
-{
-    uint8_t sun_led = 0;
-    if (usb_led & (1<<USB_LED_NUM_LOCK))    sun_led |= (1<<0);
-    if (usb_led & (1<<USB_LED_COMPOSE))     sun_led |= (1<<1);
-    if (usb_led & (1<<USB_LED_SCROLL_LOCK)) sun_led |= (1<<2);
-    if (usb_led & (1<<USB_LED_CAPS_LOCK))   sun_led |= (1<<3);
-
-    serial_send(0x0E);
-    serial_send(sun_led);
-}
diff --git a/converter/pc98_usb/matrix.c b/converter/pc98_usb/matrix.c
index 19cfb0c0..c6b6253a 100644
--- a/converter/pc98_usb/matrix.c
+++ b/converter/pc98_usb/matrix.c
@@ -155,3 +155,18 @@ uint8_t matrix_get_row(uint8_t row)
 {
     return matrix[row];
 }
+
+void led_set(uint8_t usb_led)
+{
+#ifdef PC98_LED_CONTROL
+    uint8_t led_state = 0x70;
+    if (usb_led & (1<<USB_LED_NUM_LOCK))    led_state |= (1<<0);
+    if (usb_led & (1<<USB_LED_CAPS_LOCK))   led_state |= (1<<2);
+    xprintf("led_set: %02X\n", led_state);
+
+    pc98_send(0x9D);
+    _delay_ms(100);
+    pc98_send(led_state);
+    // responses(FA or FC) will be ignored in matrix_scan()
+#endif
+}