diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index ba3a9a0446..19066c76ad 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -93,6 +93,9 @@ void SPIClass::setDataMode(uint8_t dataMode) {
     bool CPOL = (dataMode & 0x10); ///< CPOL (Clock Polarity)
     bool CPHA = (dataMode & 0x01); ///< CPHA (Clock Phase)
 
+    if ( CPOL )		// Ensure same behavior as 
+      CPHA ^= 1;	// SAM, AVR and Intel Boards
+
     if(CPHA) {
         SPI1U |= (SPIUSME);
     } else {