diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDC.c
index 31fd8f1b062dc2a4ca33b7e7238e97a4c4012f5c..816a5f13db2b9aa0c79e3dfc3c2ad1c250d86ad2 100644
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDC.c
@@ -118,6 +118,11 @@ void CDC_Device_USBTask(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)
 	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
 	  return;
 
+	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber);
+
+	if (Endpoint_IsOUTReceived() && !(Endpoint_BytesInEndpoint()))
+	  Endpoint_ClearOUT();
+	  
 	CDC_Device_Flush(CDCInterfaceInfo);
 }
 
diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 669b94e0741523518ff4f26abb54970dc95e7e35..5ba3f9c89212e0faf919a0fd5b2f696c2bd77341 100644
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -12,9 +12,7 @@
   *  or post your suggestion as an enhancement request to the project bug tracker.
   *
   *  <b>Targeted for This Release:</b>
-  *  - Finish Host Mode Class Drivers, re-enable in makefile, add demo summaries
-  *      (S) HID
-  *      ( ) Still Image
+  *  - Finish HID and Still Image Host Mode Class Drivers, add demo summaries, add return codes to all relevant functions
   *  - Add overviews of each of the officially supported boards to the manual
   *  - Re-add in flip, flip-ee, dfu and dfu-ee targets to project makefiles
   *  - Add in new invalid event hook check targets to project makefiles