diff --git a/Demos/MassStorageHost/MassStoreCommands.c b/Demos/MassStorageHost/MassStoreCommands.c
index c4b315b0a8..f4143adcf6 100644
--- a/Demos/MassStorageHost/MassStoreCommands.c
+++ b/Demos/MassStorageHost/MassStoreCommands.c
@@ -41,8 +41,9 @@
  *        may be neccesary to retry the functions in the module several times
  *        after they have returned and error to successfully send the command
  *        to the device. Some devices may also need to have the stream function
- *        timeout period extended beyond 100ms by defining USB_STREAM_TIMEOUT_MS
- *        to a larger value in the project makefile and passing it to the compiler
+ *        timeout period extended beyond 100ms (some badly designed devices exceeding
+ *        1.5 seconds occasionally) by defining USB_STREAM_TIMEOUT_MS to a
+ *        larger value in the project makefile and passing it to the compiler
  *        via the -D switch.
  */
  
diff --git a/Demos/MassStorageHost/makefile b/Demos/MassStorageHost/makefile
index fb04798e8e..2608b76bb7 100644
--- a/Demos/MassStorageHost/makefile
+++ b/Demos/MassStorageHost/makefile
@@ -180,6 +180,7 @@ CSTANDARD = -std=gnu99
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
 CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_HOST_ONLY
 CDEFS += -DUSE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+CDEFS += -DUSB_STREAM_TIMEOUT_MS=2000
 
 
 # Place -D or -U options here for ASM sources