diff --git a/conf/modules/pose_history.xml b/conf/modules/pose_history.xml
new file mode 100644
index 0000000000..45d5e91398
--- /dev/null
+++ b/conf/modules/pose_history.xml
@@ -0,0 +1,17 @@
+<!DOCTYPE module SYSTEM "module.dtd">
+
+<module name="pose_history">
+  <doc>
+    <description>Ask this module for the pose the drone had closest to a given timestamp</description>
+    <define name="POSE_HISTORY_SIZE" value="1024" description="Length of the pose buffer"/> 
+  </doc>
+  <header>
+    <file name="pose_history.h"/>
+  </header>
+  <init fun="pose_init()"/>
+  <periodic fun="pose_periodic()" autorun="TRUE"/>
+  <makefile>
+    <file name="pose_history.c"/>
+  </makefile>
+</module>
+
diff --git a/sw/airborne/modules/pose_history/pose_history.c b/sw/airborne/modules/pose_history/pose_history.c
new file mode 100644
index 0000000000..a1408f4e88
--- /dev/null
+++ b/sw/airborne/modules/pose_history/pose_history.c
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) Roland Meertens
+ *
+ * This file is part of paparazzi
+ *
+ * paparazzi 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 2, or (at your option)
+ * any later version.
+ *
+ * paparazzi 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 paparazzi; see the file COPYING.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+/**
+ * @file "modules/pose_history/pose_history.c"
+ * @author Roland Meertens
+ * Ask this module for the pose the drone had closest to a given timestamp
+ */
+
+#include "modules/pose_history/pose_history.h"
+#include <sys/time.h>
+#include "mcu_periph/sys_time.h"
+#include "state.h"
+#ifdef __linux__
+#include <pthread.h>
+#endif
+
+#ifndef POSE_HISTORY_SIZE
+#define POSE_HISTORY_SIZE 1024
+#endif
+
+struct rotation_history_ring_buffer_t {
+  uint32_t ring_index;
+  uint32_t ring_size;
+  struct pose_t ring_data[POSE_HISTORY_SIZE];
+};
+
+struct rotation_history_ring_buffer_t location_history;
+
+#ifdef __linux__
+pthread_mutex_t pose_mutex;
+#endif
+
+/**
+ * Given a pprz timestamp in used (obtained with get_sys_time_usec) we return the pose in FloatEulers closest to that time.
+ */
+struct pose_t get_rotation_at_timestamp(uint32_t timestamp)
+{
+#ifdef __linux__
+  pthread_mutex_lock(&pose_mutex);
+#endif
+  uint32_t index_history = 0;
+  uint32_t closestTimeDiff = abs(timestamp - location_history.ring_data[0].timestamp);
+  uint32_t closestIndex = 0;
+
+  // Seach for the timestamp closes to the timestamp argument of this function.
+  for (index_history = 0; index_history < location_history.ring_size; index_history++) {
+    uint32_t diff = abs(timestamp - location_history.ring_data[index_history].timestamp);
+    if (diff < closestTimeDiff) {
+      closestIndex = index_history;
+      closestTimeDiff = diff;
+    }
+  }
+
+  // Save the pose closest to the given timestamp and return this
+  struct pose_t closest_pose;
+  closest_pose.eulers = location_history.ring_data[closestIndex].eulers;
+  closest_pose.rates = location_history.ring_data[closestIndex].rates;
+
+#ifdef __linux__
+  pthread_mutex_unlock(&pose_mutex);
+#endif
+  return closest_pose;
+}
+
+/**
+ * Initialises the pose history
+ */
+void pose_init()
+{
+  location_history.ring_index = 0;
+  location_history.ring_size = POSE_HISTORY_SIZE;
+}
+
+
+/**
+ * Records the pose history 512 times per second. Time gets saved in pprz usec, obtained with get_sys_time_usec();
+ */
+void pose_periodic()
+{
+  uint32_t now_ts = get_sys_time_usec();
+#ifdef __linux__
+  pthread_mutex_lock(&pose_mutex);
+#endif
+  struct pose_t *current_time_and_rotation = &location_history.ring_data[location_history.ring_index];
+  current_time_and_rotation->eulers = *stateGetNedToBodyEulers_f();
+  current_time_and_rotation->rates = *stateGetBodyRates_f();
+
+  current_time_and_rotation->timestamp = now_ts;
+
+  // increase index location history
+  location_history.ring_index = (location_history.ring_index + 1) % location_history.ring_size;
+
+#ifdef __linux__
+  pthread_mutex_unlock(&pose_mutex);
+#endif
+}
+
+
diff --git a/sw/airborne/modules/pose_history/pose_history.h b/sw/airborne/modules/pose_history/pose_history.h
new file mode 100644
index 0000000000..c0549b29c6
--- /dev/null
+++ b/sw/airborne/modules/pose_history/pose_history.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) Roland Meertens
+ *
+ * This file is part of paparazzi
+ *
+ * paparazzi 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 2, or (at your option)
+ * any later version.
+ *
+ * paparazzi 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 paparazzi; see the file COPYING.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+/**
+ * @file "modules/pose_history/pose_history.h"
+ * @author Roland Meertens
+ * Ask this module for the pose the drone had closest to a given timestamp
+ */
+
+#ifndef POSE_HISTORY_H
+#define POSE_HISTORY_H
+
+#include "math/pprz_algebra_float.h"
+
+struct pose_t {
+  uint32_t timestamp;
+  struct FloatEulers eulers;
+  struct FloatRates rates;
+};
+
+extern void pose_init(void);
+extern void pose_periodic(void);
+extern struct pose_t get_rotation_at_timestamp(uint32_t timestamp);
+#endif
+