diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 7fb7d04..3c38642 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -124,6 +124,6 @@
 	range 0 3 if ARCH_DOVE
 	range 0 1 if ARCH_KIRKWOOD
 	help
-	 Select the UART number the barebox console will sit on.
+	  Select the UART number the barebox console will sit on.
 
 endif # ARCH_MVEBU
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index 3ec18f0..e1879df 100644
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
@@ -142,7 +142,7 @@
 config MACH_BEAGLEBONE
 	bool "Texas Instrument's Beagle Bone"
 	depends on ARCH_AM33XX
-	  help
+	help
 	  Say Y here if you are using Beagle Bone
 
 config MACH_OMAP3EVM
diff --git a/commands/Kconfig b/commands/Kconfig
index ede1b3a..55e46a0 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -563,14 +563,14 @@
 	prompt "nandtest"
 
 config CMD_MEMTEST
-    tristate
-    prompt "memtest"
-       help
-         The memtest command can test the registered barebox memory.
-         During this test barebox memory regions like heap, stack, ...
-	 will be skipped. If the tested architecture has MMU with PTE
-	 flags support, the memtest is running twice with cache enabled
-	 and with cache disabled
+	tristate
+	prompt "memtest"
+	help
+	  The memtest command can test the registered barebox memory.
+	  During this test barebox memory regions like heap, stack, ...
+	  will be skipped. If the tested architecture has MMU with PTE
+	  flags support, the memtest is running twice with cache enabled
+	  and with cache disabled
 
 endmenu
 
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index daf778a..2978c2e 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -11,4 +11,4 @@
 config COMMON_CLK_OF_PROVIDER
 	bool
 	help
-	 Clock driver provides OF-Tree based clock lookup.
+	  Clock driver provides OF-Tree based clock lookup.
diff --git a/lib/bootstrap/Kconfig b/lib/bootstrap/Kconfig
index 558da00..645f0b4 100644
--- a/lib/bootstrap/Kconfig
+++ b/lib/bootstrap/Kconfig
@@ -1,5 +1,5 @@
 menuconfig BOOTSTRAP
-	bool "Library bootstrap routines           "
+	bool "Library bootstrap routines"
 	depends on SHELL_NONE
 
 if BOOTSTRAP