diff --git a/Config.in b/Config.in
index 5607e55d4d1979f7421eb35bf7c1d15b47ec75fd..b7706b4deb6f9c5ff84424900e57fce1b222a7cf 100644
--- a/Config.in
+++ b/Config.in
@@ -173,7 +173,7 @@ menu "Target Images"
 	menuconfig TARGET_ROOTFS_INCLUDE_KERNEL
 		bool "Include kernel in root filesystem"
 		depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
-		default n if USES_UBIFS
+		default n
 		help
 		  Include the kernel image in the rootfs. Typically the image is placed
 		  below /boot.
@@ -205,7 +205,7 @@ menu "Target Images"
 	config TARGET_ROOTFS_INCLUDE_DTB
 		bool "Include DTB in root filesystem"
 		depends on USES_DEVICETREE && (TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS)
-		default n if USES_UBIFS
+		default n
 		help
 		  Include the device tree blob file(s) in the rootfs. Typically the DTBs
 		  are placed below /boot.