diff --git a/keyboard/ghpad/Makefile b/keyboard/ghpad/Makefile
index f1cecfb0..09636010 100644
--- a/keyboard/ghpad/Makefile
+++ b/keyboard/ghpad/Makefile
@@ -112,6 +112,11 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 #   USBaspLoader     2048
 OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
+# Additional definitions from command line
+ifdef DEFS
+    OPT_DEFS += $(foreach DEF,$(DEFS),-D$(DEF))
+endif
+
 
 # Build Options
 #   comment out to disable the options.
@@ -122,7 +127,7 @@ 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
 #PS2_MOUSE_ENABLE = yes	# PS/2 mouse(TrackPoint) support
 BACKLIGHT_ENABLE = yes	# Enable keyboard backlight functionality
 KEYMAP_EX_ENABLE = yes	# External keymap in eeprom
diff --git a/keyboard/ghpad/config.h b/keyboard/ghpad/config.h
index eed9cbc9..b710f42e 100644
--- a/keyboard/ghpad/config.h
+++ b/keyboard/ghpad/config.h
@@ -54,11 +54,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* key combination for command */
+#ifndef __ASSEMBLER__
+#include "matrix.h"
 #define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+    matrix_is_on(0, 0) && matrix_is_on(0, MATRIX_COLS - 1) \
 )
+#endif
 
-
+/* boot magic key */
+#define BOOTMAGIC_KEY_SALT KC_FN0
 
 /*
  * Feature disable options