diff --git a/conf/modules/nps.xml b/conf/modules/nps.xml
new file mode 100644
index 0000000000..c445e31bd2
--- /dev/null
+++ b/conf/modules/nps.xml
@@ -0,0 +1,91 @@
+
+
+
+
+
+ New Paparazzi Simulator (NPS)
+
+ Bindings between embedded autopilot code and a flight dynamic model (FDM).
+ Possible FDM are: JSBSim or CRRCSIM, see corresponding modules.
+ Can run Software In The Loop (SITL) or Hardware In The Loop (HITL) simulations.
+
+
+
+
+
+
+
+
+
+
+
+ nps.LDFLAGS += -lm -livy $(shell pcre-config --libs) -lgsl -lgslcblas
+
+ # detect system arch and include rt and pthread library only on linux
+ UNAME_S := $(shell uname -s)
+ ifeq ($(UNAME_S),Linux)
+ nps.LDFLAGS += -lrt -pthread
+ endif
+
+ # sdl needed for joystick input
+ nps.LDFLAGS += $(shell sdl-config --libs)
+
+ # glib is still needed for some components (such as radio input)
+ nps.CFLAGS += $(shell pkg-config glib-2.0 --cflags)
+ nps.LDFLAGS += $(shell pkg-config glib-2.0 --libs)
+
+ #
+ # add the simulator directory to the make searchpath
+ #
+ VPATH += $(PAPARAZZI_SRC)/sw/simulator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/conf/modules/sim.xml b/conf/modules/sim.xml
new file mode 100644
index 0000000000..3bc267035b
--- /dev/null
+++ b/conf/modules/sim.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+ Basic Simulator (SIM)
+
+ Bindings between embedded autopilot code and a flight dynamic model (FDM).
+ FDM and low level code is written in OCaml.
+ Only for fixed-wing.
+
+
+
+
+
+
+ UNAME = $(shell uname -s)
+ ifeq ("$(UNAME)","Darwin")
+ sim.CFLAGS += $(shell if test -d /opt/paparazzi/include; then echo "-I/opt/paparazzi/include"; elif test -d /opt/local/include; then echo "-I/opt/local/include"; fi)
+ endif
+
+
+
+
+
+
+
+
+
diff --git a/conf/modules/telemetry_ivy.xml b/conf/modules/telemetry_ivy.xml
index dc0b5bdb89..e3b2319545 100644
--- a/conf/modules/telemetry_ivy.xml
+++ b/conf/modules/telemetry_ivy.xml
@@ -21,5 +21,16 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/conf/modules/telemetry_sim.xml b/conf/modules/telemetry_sim.xml
index 7abd64cc54..c95d36c983 100644
--- a/conf/modules/telemetry_sim.xml
+++ b/conf/modules/telemetry_sim.xml
@@ -22,6 +22,9 @@
+
+
+