diff --git a/drivers/usbdev/Make.defs b/drivers/usbdev/Make.defs
index 1a79570e44..1bd391fa9d 100644
--- a/drivers/usbdev/Make.defs
+++ b/drivers/usbdev/Make.defs
@@ -37,6 +37,9 @@ USBDEV_ASRCS  =
 USBDEV_CSRCS  =
 
 ifeq ($(CONFIG_USBDEV),y)
-USBDEV_CSRCS  += usbdev_serial.c usbdev_storage.c usbdev_trace.c
+ifeq ($(CONFIG_USBSER),y)
+USBDEV_CSRCS  += usbdev_serial.c
+endif
+USBDEV_CSRCS  += usbdev_trace.c
 endif
 
diff --git a/tools/mkconfig.c b/tools/mkconfig.c
index 695b452989..071f0588a8 100644
--- a/tools/mkconfig.c
+++ b/tools/mkconfig.c
@@ -263,13 +263,13 @@ int main(int argc, char **argv, char **envp)
   printf("# undef CONFIG_FS_FAT\n");
   printf("# undef CONFIG_FS_ROMFS\n");
   printf("#endif\n\n");
-  printf("/* Check if any readable and writable filesystem is supported */\n\n");
+  printf("/* Check if any readable and writable filesystem (OR USB storage) is supported */\n\n");
   printf("#undef CONFIG_FS_READABLE\n");
   printf("#undef CONFIG_FS_WRITABLE\n");
-  printf("#if defined(CONFIG_FS_FAT) || defined(CONFIG_FS_ROMFS)\n");
+  printf("#if defined(CONFIG_FS_FAT) || defined(CONFIG_FS_ROMFS) || defined(CONFIG_USBSTRG)\n");
   printf("# define CONFIG_FS_READABLE 1\n");
   printf("#endif\n\n");
-  printf("#if defined(CONFIG_FS_FAT)\n");
+  printf("#if defined(CONFIG_FS_FAT) || defined(CONFIG_USBSTRG)\n");
   printf("# define CONFIG_FS_WRITABLE 1\n");
   printf("#endif\n\n");
   printf("/* There can be no network support with no socket descriptors */\n\n");