diff --git a/conf/airframes/examples/microjet.xml b/conf/airframes/examples/microjet.xml
index 13163b80fb..80478b837c 100644
--- a/conf/airframes/examples/microjet.xml
+++ b/conf/airframes/examples/microjet.xml
@@ -196,6 +196,7 @@
     <load name="openlog.xml"/>
     <load name="nav_survey_rectangle.xml"/>
     <load name="nav_survey_poly_adv.xml"/>
+    <load name="nav_border_line.xml"/>
     <load name="infrared_adc.xml"/>
     <load name="digital_cam_servo.xml">
       <define name="DC_SHUTTER_SERVO" value="COMMAND_SHUTTER" />
diff --git a/conf/firmwares/subsystems/fixedwing/navigation_extra.makefile b/conf/firmwares/subsystems/fixedwing/navigation_extra.makefile
index b5448fa32e..72e53326c3 100644
--- a/conf/firmwares/subsystems/fixedwing/navigation_extra.makefile
+++ b/conf/firmwares/subsystems/fixedwing/navigation_extra.makefile
@@ -13,5 +13,4 @@ $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_line.c
 
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/OSAMNav.c
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/snav.c
-$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/border_line.c
 
diff --git a/conf/flight_plans/nav_modules.xml b/conf/flight_plans/nav_modules.xml
index 43ec60479a..ee30883e16 100644
--- a/conf/flight_plans/nav_modules.xml
+++ b/conf/flight_plans/nav_modules.xml
@@ -77,11 +77,11 @@
       <call fun="init_poly_survey_adv(WP_S1,5,0,30,10,50,100)"/>
       <call fun="poly_survey_adv()"/>
     </block>
-    <block group="extra_pattern" name="Path 1,2,S1,S2,STDBY" strip_button="Path (1,2,S1,S2,STDBY)" strip_icon="path.png">
-      <path wpts="1,2 S1"/>
-      <path approaching_time="1" pitch="auto" throttle="0.4" wpts="S1, S2 STDBY"/>
-      <deroute block="Standby"/>
+    <block name="Border line 1-2" strip_button="Border Line (wp 1-2)">
+      <call fun="border_line_init()"/>
+      <call fun="border_line(WP_1, WP_2, nav_radius)"/>
     </block>
+
     <block group="land" name="Land Right AF-TD" strip_button="Land right (wp AF-TD)" strip_icon="land-right.png">
       <set value="DEFAULT_CIRCLE_RADIUS" var="nav_radius"/>
       <deroute block="land"/>
diff --git a/conf/modules/nav_border_line.xml b/conf/modules/nav_border_line.xml
new file mode 100644
index 0000000000..378fbbf76b
--- /dev/null
+++ b/conf/modules/nav_border_line.xml
@@ -0,0 +1,25 @@
+<!DOCTYPE module SYSTEM "module.dtd">
+
+<module name="nav_border_line" dir="nav">
+  <doc>
+    <description>
+       navigate along a border line (line 1-2) with turns in the same direction
+
+       you can use this function to navigate along a border if it is essetial not to cross it
+       navigation is along line p1, p2 with turns in the same direction to make sure you dont cross the line
+       take care youre navigation radius is not to small in strong wind conditions!
+       In the flight plan:
+       <!--
+        <call fun="nav_line_init()"/>
+        <call fun="nav_line(WP_waypoint1_name, WP_waypoint1_name, nav_radius)"/>
+       -->
+
+    </description>
+  </doc>
+  <header>
+    <file name="nav_border_line.h"/>
+  </header>
+  <makefile>
+    <file name="nav_border_line.c"/>
+  </makefile>
+</module>
diff --git a/sw/airborne/subsystems/navigation/border_line.c b/sw/airborne/modules/nav/nav_border_line.c
similarity index 96%
rename from sw/airborne/subsystems/navigation/border_line.c
rename to sw/airborne/modules/nav/nav_border_line.c
index 898dbde5f8..c3e9b9c9ac 100644
--- a/sw/airborne/subsystems/navigation/border_line.c
+++ b/sw/airborne/modules/nav/nav_border_line.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 Tobias Muench
- * modified nav_linie by Anton Kochevar, ENAC
+ * modified nav_line by Anton Kochevar, ENAC
  *
  * This file is part of paparazzi.
  *
@@ -21,7 +21,7 @@
  */
 
 /**
- * @file subsystems/navigation/border_line.c
+ * @file modules/nav/nav_border_line.c
  * @brief navigate along a border line (line 1-2) with turns in the same direction
  *
  * you can use this function to navigate along a border if it is essetial not to cross it
@@ -29,7 +29,7 @@
  * take care youre navigation radius is not to small in strong wind conditions!
  */
 
-#include "subsystems/navigation/border_line.h"
+#include "modules/nav/nav_border_line.h"
 #include "generated/airframe.h"
 #include "subsystems/nav.h"
 
diff --git a/sw/airborne/subsystems/navigation/border_line.h b/sw/airborne/modules/nav/nav_border_line.h
similarity index 96%
rename from sw/airborne/subsystems/navigation/border_line.h
rename to sw/airborne/modules/nav/nav_border_line.h
index 7814fc9223..431a82c0b8 100644
--- a/sw/airborne/subsystems/navigation/border_line.h
+++ b/sw/airborne/modules/nav/nav_border_line.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file subsystems/navigation/border_line.h
+ * @file modules/nav/nav_border_line.h
  * @brief navigate along a border line (line 1-2) with turns in the same direction
  */