diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde
index e36be9d7ed..b530b081d2 100644
--- a/ArduPlane/ArduPlane.pde
+++ b/ArduPlane/ArduPlane.pde
@@ -29,7 +29,7 @@ version 2.1 of the License, or (at your option) any later version.
 #include <Arduino_Mega_ISR_Registry.h>
 #include <APM_RC.h>         // ArduPilot Mega RC Library
 #include <AP_GPS.h>         // ArduPilot GPS library
-#include <Wire.h>			// Arduino I2C lib
+#include <I2C.h>			// Wayne Truchsess I2C lib
 #include <SPI.h>			// Arduino SPI lib
 #include <DataFlash.h>      // ArduPilot Mega Flash Memory Library
 #include <AP_ADC.h>         // ArduPilot Mega Analog to Digital Converter Library
diff --git a/ArduPlane/system.pde b/ArduPlane/system.pde
index e6513cfe8a..b3a30b7a5e 100644
--- a/ArduPlane/system.pde
+++ b/ArduPlane/system.pde
@@ -107,7 +107,8 @@ static void init_ardupilot()
 	// Initialize Wire and SPI libraries
 	//
 #ifndef DESKTOP_BUILD
-    Wire.begin();
+    I2c.begin();
+    I2c.timeOut(20);
 #endif
     SPI.begin();
     SPI.setClockDivider(SPI_CLOCK_DIV16); // 1MHZ SPI rate