diff --git a/conf/firmwares/subsystems/fixedwing/navigation_extra.makefile b/conf/firmwares/subsystems/fixedwing/navigation_extra.makefile
index cbd3236864..09025c127a 100644
--- a/conf/firmwares/subsystems/fixedwing/navigation_extra.makefile
+++ b/conf/firmwares/subsystems/fixedwing/navigation_extra.makefile
@@ -14,6 +14,5 @@ $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_survey_rectangle.c $(SRC_SUBS
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/OSAMNav.c
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/snav.c
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/poly_survey_adv.c
-$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/gls.c
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/border_line.c
 
diff --git a/conf/modules/nav_gls.xml b/conf/modules/nav_gls.xml
new file mode 100644
index 0000000000..cc28bd4a03
--- /dev/null
+++ b/conf/modules/nav_gls.xml
@@ -0,0 +1,18 @@
+<!DOCTYPE module SYSTEM "module.dtd">
+
+<module name="nav_gls" dir="nav">
+  <doc>
+    <description>
+      gps landing system
+ * -automatic calculation of top of decent for const app angle
+ * -smooth intercept posible
+ * -landing direction is set by app fix / also possible in flight!!!
+    </description>
+  </doc>
+  <header>
+    <file name="nav_gls.h"/>
+  </header>
+  <makefile>
+    <file name="nav_gls.c"/>
+  </makefile>
+</module>
diff --git a/sw/airborne/subsystems/navigation/gls.c b/sw/airborne/modules/nav/nav_gls.c
similarity index 99%
rename from sw/airborne/subsystems/navigation/gls.c
rename to sw/airborne/modules/nav/nav_gls.c
index 4d551892a0..5b0fe093b7 100644
--- a/sw/airborne/subsystems/navigation/gls.c
+++ b/sw/airborne/modules/nav/nav_gls.c
@@ -46,7 +46,7 @@
 
 #include "generated/airframe.h"
 #include "state.h"
-#include "subsystems/navigation/gls.h"
+#include "modules/nav/nav_gls.h"
 #include "subsystems/nav.h"
 #include "generated/flight_plan.h"
 
diff --git a/sw/airborne/subsystems/navigation/gls.h b/sw/airborne/modules/nav/nav_gls.h
similarity index 96%
rename from sw/airborne/subsystems/navigation/gls.h
rename to sw/airborne/modules/nav/nav_gls.h
index 1073cc3c79..f42443de57 100644
--- a/sw/airborne/subsystems/navigation/gls.h
+++ b/sw/airborne/modules/nav/nav_gls.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file subsystems/navigation/gls.h
+ * @file modules/nav/nav_gls.h
  * @brief gps landing system
  */