diff --git a/conf/modules/servo_switch.xml b/conf/modules/servo_switch.xml
index 7e5eb38359..e108e61a4c 100644
--- a/conf/modules/servo_switch.xml
+++ b/conf/modules/servo_switch.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="servo_switch">
+<module name="servo_switch" dir="servo_switch">
   <header>
     <file name="servo_switch.h"/>
   </header>
diff --git a/conf/settings/settings_servo_switch.xml b/conf/settings/settings_servo_switch.xml
index 0590bcd759..7bede7e51a 100644
--- a/conf/settings/settings_servo_switch.xml
+++ b/conf/settings/settings_servo_switch.xml
@@ -3,7 +3,7 @@
 <settings>
   <dl_settings NAME="Servo switch control">
     <dl_settings NAME="SWITCH">
-      <dl_setting var="servo_switch_on" min="0" step="1" max="1" module="servo_switch" values="Off|On">
+      <dl_setting var="servo_switch_on" min="0" step="1" max="1" module="servo_switch/servo_switch" values="Off|On">
         <strip_button name="ON"  value="1"/>
         <strip_button name="OFF" value="0"/>
       </dl_setting>
diff --git a/sw/airborne/modules/servo_switch/servo_switch.c b/sw/airborne/modules/servo_switch/servo_switch.c
index 832c399e85..d553fdcb1c 100644
--- a/sw/airborne/modules/servo_switch/servo_switch.c
+++ b/sw/airborne/modules/servo_switch/servo_switch.c
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "servo_switch.h"
+#include "servo_switch/servo_switch.h"
 #include "inter_mcu.h"
 
 bool_t servo_switch_on;