diff --git a/conf/modules/gps_ubx_uart.xml b/conf/modules/gps_ubx_uart.xml
new file mode 100644
index 00000000000..55ea724d27e
--- /dev/null
+++ b/conf/modules/gps_ubx_uart.xml
@@ -0,0 +1,22 @@
+<!DOCTYPE module SYSTEM "module.dtd">
+
+<module name="gps_ubx" dir="gps">
+  <header>
+    <file name="gps_ubx_uart.h"/>
+  </header>
+  <init fun="gps_init()"/>
+  <event fun="GpsEvent(on_gps_solution)"/>
+  <makefile>
+    <file name="gps.c" dir="subsystems"/>
+  </makefile>
+  <makefile target="ap">
+    <file name="gps_ubx.c" dir="subsystems/gps"/>
+    <define name="GPS_TYPE_H" value="\"subsystems/gps/gps_ubx.h\""/>
+  </makefile>
+  <makefile target="sim|jsbsim">
+    <file name="gps_sim.c" dir="subsystems/gps"/>
+    <define name="GPS_TYPE_H" value="\"subsystems/gps/gps_sim.h\""/>
+  </makefile>
+</module>
+
+
diff --git a/sw/airborne/modules/gps/gps_ubx_uart.h b/sw/airborne/modules/gps/gps_ubx_uart.h
new file mode 100644
index 00000000000..3349680f443
--- /dev/null
+++ b/sw/airborne/modules/gps/gps_ubx_uart.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2011 Gautier Hattenberger
+ *
+ * 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, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+/*
+ * Wrapper for UBX gps on uart
+ */
+
+#ifndef MODULE_GPS_UBX_UART_H
+#define MODULE_GPS_UBX_UART_H
+
+#include "subsystems/gps.h"
+#include "subsystems/gps/gps_ubx.h"
+
+#endif // MODULE_GPS_UBX_UART_H
+