diff --git a/LUFA/Drivers/Peripheral/SerialStream.h b/LUFA/Drivers/Peripheral/SerialStream.h
index 80fa681acf..e03ce4128c 100644
--- a/LUFA/Drivers/Peripheral/SerialStream.h
+++ b/LUFA/Drivers/Peripheral/SerialStream.h
@@ -89,6 +89,7 @@
 				Serial_Init(BaudRate, DoubleSpeed);
 				
 				stdout = &USARTStream;
+				stdin  = &USARTStream;
 			}
 			
 			/** Turns off the serial stream (and regular USART driver), disabling and returning used hardware to
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 5fd1b2ba49..aaeaebd864 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -54,6 +54,7 @@
   *  - Fixed EEPROM and FLASH ISP programming in the AVRISP project
   *  - Fixed incorrect values of USB_CONFIG_ATTR_SELFPOWERED and USB_CONFIG_ATTR_REMOTEWAKEUP tokens (thanks to Claus Christensen)
   *  - Fixed SerialStream driver blocking while waiting for characters to be received instead of returning EOF
+  *  - Fixed SerialStream driver not setting stdin to the created serial stream
   *
   *  \section Sec_ChangeLog091223 Version 091223
   *