diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index bc698f6ad4..2762faf665 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3859,4 +3859,6 @@
 	  Fix a counting bug plus change interface to use either relative
 	  or absolut FLASH addressing (from Freddie Chopin).
 	* libc/misc/Make.defs:  Fix error in conditional for KBD CODEC.
+	* libc/Kconfig and configs/*/defconfig (several):  The default
+	  setting should be CONFIG_LIB_KBDCODEC=n
 
diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig
index 1213797a77..64f4397cb5 100755
--- a/nuttx/configs/lm3s6965-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig
@@ -424,7 +424,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Non-standard Helper Functions
 #
-CONFIG_LIB_KBDCODEC=y
+# CONFIG_LIB_KBDCODEC is not set
 
 #
 # Basic CXX Support
diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig
index 7fca4d7357..be75c28755 100755
--- a/nuttx/configs/lm3s6965-ek/nx/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nx/defconfig
@@ -431,7 +431,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Non-standard Helper Functions
 #
-CONFIG_LIB_KBDCODEC=y
+# CONFIG_LIB_KBDCODEC is not set
 
 #
 # Basic CXX Support
diff --git a/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig
index abfdcc251f..83e89a6ae7 100755
--- a/nuttx/configs/lm3s6965-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig
@@ -363,7 +363,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Non-standard Helper Functions
 #
-CONFIG_LIB_KBDCODEC=y
+# CONFIG_LIB_KBDCODEC is not set
 
 #
 # Basic CXX Support
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
index 6ae163386a..e065ef3fb2 100644
--- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
@@ -381,7 +381,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Non-standard Helper Functions
 #
-CONFIG_LIB_KBDCODEC=y
+# CONFIG_LIB_KBDCODEC is not set
 
 #
 # Basic CXX Support
diff --git a/nuttx/configs/sim/nxlines/defconfig b/nuttx/configs/sim/nxlines/defconfig
index c023af6743..c798b175fd 100644
--- a/nuttx/configs/sim/nxlines/defconfig
+++ b/nuttx/configs/sim/nxlines/defconfig
@@ -347,7 +347,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Non-standard Helper Functions
 #
-CONFIG_LIB_KBDCODEC=y
+# CONFIG_LIB_KBDCODEC is not set
 
 #
 # Basic CXX Support
diff --git a/nuttx/configs/zp214xpa/nsh/defconfig b/nuttx/configs/zp214xpa/nsh/defconfig
index 7c7d9d06cf..7f8ddc19b9 100644
--- a/nuttx/configs/zp214xpa/nsh/defconfig
+++ b/nuttx/configs/zp214xpa/nsh/defconfig
@@ -358,7 +358,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Non-standard Helper Functions
 #
-CONFIG_LIB_KBDCODEC=y
+# CONFIG_LIB_KBDCODEC is not set
 
 #
 # Basic CXX Support
diff --git a/nuttx/configs/zp214xpa/nxlines/defconfig b/nuttx/configs/zp214xpa/nxlines/defconfig
index 03a6bf72cd..209b4a5e4f 100644
--- a/nuttx/configs/zp214xpa/nxlines/defconfig
+++ b/nuttx/configs/zp214xpa/nxlines/defconfig
@@ -433,7 +433,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Non-standard Helper Functions
 #
-CONFIG_LIB_KBDCODEC=y
+# CONFIG_LIB_KBDCODEC is not set
 
 #
 # Basic CXX Support
diff --git a/nuttx/libc/Kconfig b/nuttx/libc/Kconfig
index a5ff7fd438..0ae56ac57e 100644
--- a/nuttx/libc/Kconfig
+++ b/nuttx/libc/Kconfig
@@ -280,7 +280,7 @@ comment "Non-standard Helper Functions"
 
 config LIB_KBDCODEC
 	bool "Keyboard CODEC"
-	default y
+	default n
 	---help---
 		In NuttX, a keyboard/keypad driver is simply a character driver that
 		may have an (optional) encoding/decoding layer on the data returned