diff --git a/LUFA/Drivers/Peripheral/SPI.h b/LUFA/Drivers/Peripheral/SPI.h
index c6db9f96230eca24245b13c6ea2bd90f1642de23..8c38dcc273ef01cf7a3cbbe1cda0d354a72bc159 100644
--- a/LUFA/Drivers/Peripheral/SPI.h
+++ b/LUFA/Drivers/Peripheral/SPI.h
@@ -122,6 +122,7 @@
 			static inline void SPI_Init(const uint8_t SPIOptions)
 			{
 				DDRB  |= ((1 << 1) | (1 << 2));
+				DDRB  &= ((1 << 0) | (1 << 3));
 				PORTB |= ((1 << 0) | (1 << 3));
 				
 				SPCR   = ((1 << SPE) | SPIOptions);
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 4aec15397cbe05df203cfe8008232384ab57e3ee..ee02943becf764c479c334f4ba8ce4cb1675bd7b 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -68,6 +68,7 @@
   *  - Fixed incorrect LEDs_ChangeLEDs() function in the Benito board LED driver
   *  - Fixed incorrect USB_DeviceState value when unconfiguring the device without an address set
   *  - Fixed broken FLASH/EEPROM programming in the AVRISP-MKII clone project when writing in non-paged mode and the polling byte cannot be used
+  *  - Fixed SPI driver not explicitly setting /SS and MISO pins as inputs when SPI_Init() is called
   *
   *  \section Sec_ChangeLog100807 Version 100807
   *  <b>New:</b>