diff --git a/keyboard/smart68/Makefile b/keyboard/smart68/Makefile
index ec8b8d73..b9e18697 100644
--- a/keyboard/smart68/Makefile
+++ b/keyboard/smart68/Makefile
@@ -126,10 +126,11 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
 CONSOLE_ENABLE = yes	# Console for debug(+400)
 COMMAND_ENABLE = yes	# Commands for debug and configuration
 #SLEEP_LED_ENABLE = yes	# Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
+NKRO_ENABLE = yes	# USB Nkey Rollover
+USB_6KRO_ENABLE = yes	# USB 6Key Rollover
 #PS2_MOUSE_ENABLE = yes	# PS/2 mouse(TrackPoint) support
 BACKLIGHT_ENABLE = yes	# Enable keyboard backlight functionality
-KEYMAP_EX_ENABLE = yes	# External keymap in eeprom
+KEYMAP_IN_EEPROM_ENABLE = yes	# Read keymap from eeprom
 KEYMAP_SECTION_ENABLE = yes	# Fixed address keymap for keymap editor
 BREATHING_LED_ENABLE = yes # Enable breathing backlight
 
diff --git a/keyboard/smart68/Makefile.pjrc b/keyboard/smart68/Makefile.pjrc
index e2cc38b7..913e1671 100644
--- a/keyboard/smart68/Makefile.pjrc
+++ b/keyboard/smart68/Makefile.pjrc
@@ -96,11 +96,13 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
 CONSOLE_ENABLE = yes	# Console for debug(+400)
 COMMAND_ENABLE = yes	# Commands for debug and configuration
 #SLEEP_LED_ENABLE = yes	# Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
+NKRO_ENABLE = yes	# USB Nkey Rollover
+USB_6KRO_ENABLE = yes	# USB 6Key Rollover
 #PS2_MOUSE_ENABLE = yes	# PS/2 mouse(TrackPoint) support
 BACKLIGHT_ENABLE = yes	# Enable keyboard backlight functionality
-KEYMAP_EX_ENABLE = yes	# External keymap in eeprom
+KEYMAP_IN_EEPROM_ENABLE = yes	# Read keymap from eeprom
 KEYMAP_SECTION_ENABLE = yes	# Fixed address keymap for keymap editor
+BREATHING_LED_ENABLE = yes # Enable breathing backlight