diff --git a/drivers/console/Kconfig b/drivers/console/Kconfig
index 4694ac2dc74..269a400432a 100644
--- a/drivers/console/Kconfig
+++ b/drivers/console/Kconfig
@@ -158,4 +158,7 @@ config UART_PIPE_ON_DEV_NAME
 	This option specifies the name of UART device to be used
 	for pipe UART.
 
+source "drivers/console/shells/Kconfig"
+
+
 endif
diff --git a/drivers/console/shells/Kconfig b/drivers/console/shells/Kconfig
new file mode 100644
index 00000000000..0f194ae32d3
--- /dev/null
+++ b/drivers/console/shells/Kconfig
@@ -0,0 +1,9 @@
+
+config ENABLE_SHELL
+	bool
+	prompt "Shell support"
+	default n
+	help
+	  Enabling shell services. If it is enabled, kernel shell commands are
+	  also available for use.
+
diff --git a/drivers/console/shells/shell_service.c b/drivers/console/shells/shell_service.c
index a002ee71ee3..848ae6c4fe3 100644
--- a/drivers/console/shells/shell_service.c
+++ b/drivers/console/shells/shell_service.c
@@ -22,9 +22,6 @@
  * Includes also adding basic framework commands to shell commands.
  */
 
-#ifndef _SHELLSERVICE_H
-#define _SHELLSERVICE_H
-
 #include <misc/printk.h>
 #include <misc/shell.h>
 #include <init.h>
@@ -61,5 +58,3 @@ int shell_run(struct device *dev)
 
 
 SYS_INIT(shell_run, APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
-
-#endif /* SHELLSERVICE_H */
diff --git a/misc/Kconfig b/misc/Kconfig
index eabee6965ef..14a80176fa0 100644
--- a/misc/Kconfig
+++ b/misc/Kconfig
@@ -242,14 +242,6 @@ config OMIT_FRAME_POINTER
 	trace. Recommended only for production builds which do not need to be
 	debugged.
 
-config ENABLE_SHELL
-	bool
-	prompt "Shell support"
-	default n
-	help
-	Enabling shell services. If it is enabled, kernel shell commands are
-	also available for use.
-
 source "misc/debug/Kconfig"
 
 endmenu