diff --git a/libraries/AP_NavEKF/examples/AP_NavEKF/AP_NavEKF.pde b/libraries/AP_NavEKF/examples/AP_NavEKF/AP_NavEKF.pde
new file mode 100644
index 0000000000..45381017da
--- /dev/null
+++ b/libraries/AP_NavEKF/examples/AP_NavEKF/AP_NavEKF.pde
@@ -0,0 +1,129 @@
+/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+/*
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <AP_Common.h>
+#include <AP_Progmem.h>
+#include <AP_Param.h>
+#include <AP_Math.h>
+#include <AP_HAL.h>
+#include <AP_HAL_AVR.h>
+#include <AP_HAL_AVR_SITL.h>
+#include <AP_HAL_Linux.h>
+#include <AP_HAL_Empty.h>
+#include <AP_ADC.h>
+#include <AP_Declination.h>
+#include <AP_ADC_AnalogSource.h>
+#include <Filter.h>
+#include <AP_Buffer.h>
+#include <AP_Airspeed.h>
+#include <AP_Vehicle.h>
+#include <AP_Notify.h>
+#include <DataFlash.h>
+#include <GCS_MAVLink.h>
+#include <AP_GPS.h>
+#include <AP_AHRS.h>
+#include <SITL.h>
+#include <AP_Compass.h>
+#include <AP_Baro.h>
+#include <AP_InertialSensor.h>
+#include <AP_NavEKF.h>
+#include <stdio.h>
+
+#include "LogReader.h"
+
+const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;
+
+static AP_InertialSensor_HIL ins;
+static AP_Baro_HIL barometer;
+static AP_GPS_HIL gps_driver;
+static GPS *g_gps = &gps_driver;
+static AP_Compass_HIL compass;
+static AP_AHRS_DCM ahrs(ins, g_gps);
+
+#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
+SITL sitl;
+#endif
+
+static NavEKF NavEKF(ahrs, barometer);
+static LogReader LogReader(ins, barometer, compass, g_gps);
+
+static void delay_cb()
+{
+    LogReader.wait_type(LOG_GPS_MSG);
+}
+
+void setup()
+{
+    ::printf("Starting\n");
+    LogReader.open_log("log.bin");
+
+    LogReader.wait_type(LOG_GPS_MSG);
+    LogReader.wait_type(LOG_IMU_MSG);
+    LogReader.wait_type(LOG_GPS_MSG);
+    LogReader.wait_type(LOG_IMU_MSG);
+
+    hal.scheduler->register_delay_callback(delay_cb, 5);
+
+    ahrs.set_compass(&compass);
+    
+    barometer.init();
+    barometer.calibrate();
+    compass.init();
+    ins.init(AP_InertialSensor::WARM_START, AP_InertialSensor::RATE_50HZ);
+
+}
+
+void loop()
+{
+    while (true) {
+        uint8_t type;
+        if (!LogReader.update(type)) {
+            ::printf("End of log\n");
+            exit(0);
+        }
+        switch (type) {
+        case LOG_GPS_MSG:
+            g_gps->update();
+            barometer.read();
+            break;
+
+        case LOG_ATTITUDE_MSG:
+            ::printf("t=%.3f AHRS: (%.1f %.1f %.1f) ATT: (%.1f %.1f %.1f) ALT: %.1f GPS: %u %f %f\n", 
+                     hal.scheduler->millis() * 0.001f,
+                     ahrs.roll_sensor*0.01f, 
+                     ahrs.pitch_sensor*0.01f,
+                     ahrs.yaw_sensor*0.01f,
+                     LogReader.get_attitude().x,
+                     LogReader.get_attitude().y,
+                     LogReader.get_attitude().z,
+                     barometer.get_altitude(),
+                     (unsigned)g_gps->status(),
+                     g_gps->latitude*1.0e-7f,
+                     g_gps->longitude*1.0e-7f);
+            break;
+
+        case LOG_COMPASS_MSG:
+            compass.read();
+            break;
+
+        case LOG_IMU_MSG:
+            ahrs.update();
+            break;
+        }
+    }
+}
+
+AP_HAL_MAIN();
diff --git a/libraries/AP_NavEKF/examples/AP_NavEKF/Makefile b/libraries/AP_NavEKF/examples/AP_NavEKF/Makefile
new file mode 100644
index 0000000000..f5daf25151
--- /dev/null
+++ b/libraries/AP_NavEKF/examples/AP_NavEKF/Makefile
@@ -0,0 +1 @@
+include ../../../../mk/apm.mk