diff --git a/conf/airframes/CDW/test/ChimuLisaFw.xml b/conf/airframes/CDW/test/ChimuLisaFw.xml
index ee6d762678..3c67cd6c68 100644
--- a/conf/airframes/CDW/test/ChimuLisaFw.xml
+++ b/conf/airframes/CDW/test/ChimuLisaFw.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- Microjet Multiplex (http://www.multiplex-rc.de/)
-     Tiny 1.1 board (http://paparazzi.enac.fr/wiki/Tiny)
+     Tiny 1.1 board (http://wiki.paparazziuav.org/wiki/Tiny)
      Tilted infrared sensor
      Xbee modem in API mode
 -->
diff --git a/conf/airframes/CDW/tricopter_cdw.xml b/conf/airframes/CDW/tricopter_cdw.xml
index d153c82228..b0455671db 100644
--- a/conf/airframes/CDW/tricopter_cdw.xml
+++ b/conf/airframes/CDW/tricopter_cdw.xml
@@ -123,7 +123,7 @@ LiPo/LiIo-Zellen: 2-3
   </section>
 
   <!-- local magnetic field, calculated for: 52°3'56", 4°31'24" -->
-  <!-- http://paparazzi.enac.fr/wiki/Subsystem/ahrs#Local_Magnetic_Field -->
+  <!-- http://wiki.paparazziuav.org/wiki/Subsystem/ahrs#Local_Magnetic_Field -->
   <section name="AHRS" prefix="AHRS_">
     <define name="H_X" value="0.513081"/>
     <define name="H_Y" value="-0.00242783"/>
diff --git a/conf/airframes/ENAC/fixed-wing/twinjet2.xml b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
index 7197dc0d9a..e11d38f3e7 100644
--- a/conf/airframes/ENAC/fixed-wing/twinjet2.xml
+++ b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE airframe SYSTEM "../../airframe.dtd">
 
 <!-- Twinjet Multiplex (http://www.multiplex-rc.de/)
-     Tiny 2.12 board (http://paparazzi.enac.fr/wiki/index.php/Tiny_v2)
+     Tiny 2.12 board (http://wiki.paparazziuav.org/wiki/index.php/Tiny_v2)
      Tilted infrared sensor
 -->
 
diff --git a/conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml b/conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
index 126095f253..74378b04c9 100644
--- a/conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
+++ b/conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
@@ -82,7 +82,7 @@
   </section>
 
   <!-- local magnetic field, calculated for: 52°3'56", 4°31'24" -->
-  <!-- http://paparazzi.enac.fr/wiki/Subsystem/ahrs#Local_Magnetic_Field -->
+  <!-- http://wiki.paparazziuav.org/wiki/Subsystem/ahrs#Local_Magnetic_Field -->
   <section name="AHRS" prefix="AHRS_">
     <define name="H_X" value="0.513081"/>
     <define name="H_Y" value="-0.00242783"/>
diff --git a/conf/airframes/ardrone2_raw.xml b/conf/airframes/ardrone2_raw.xml
index 69ef3d5523..1d74c8e9c1 100644
--- a/conf/airframes/ardrone2_raw.xml
+++ b/conf/airframes/ardrone2_raw.xml
@@ -94,7 +94,7 @@
   </section>
 
   <!-- local magnetic field -->
-  <!-- http://paparazzi.enac.fr/wiki/Subsystem/ahrs#Local_Magnetic_Field -->
+  <!-- http://wiki.paparazziuav.org/wiki/Subsystem/ahrs#Local_Magnetic_Field -->
   <section name="AHRS" prefix="AHRS_">
     <!-- Toulouse -->
     <define name="H_X" value="0.513081"/>
diff --git a/conf/airframes/ardrone2_raw_optitrack.xml b/conf/airframes/ardrone2_raw_optitrack.xml
index 56254ab3ab..03c5c829ad 100644
--- a/conf/airframes/ardrone2_raw_optitrack.xml
+++ b/conf/airframes/ardrone2_raw_optitrack.xml
@@ -97,7 +97,7 @@
   </section>
 
   <!-- local magnetic field -->
-  <!-- http://paparazzi.enac.fr/wiki/Subsystem/ahrs#Local_Magnetic_Field -->
+  <!-- http://wiki.paparazziuav.org/wiki/Subsystem/ahrs#Local_Magnetic_Field -->
   <section name="AHRS" prefix="AHRS_">
     <!-- Toulouse -->
     <define name="H_X" value="0.513081"/>
diff --git a/conf/airframes/examples/bixler_lisa_m_2.xml b/conf/airframes/examples/bixler_lisa_m_2.xml
index 8fb060bc6d..0af96e14ef 100644
--- a/conf/airframes/examples/bixler_lisa_m_2.xml
+++ b/conf/airframes/examples/bixler_lisa_m_2.xml
@@ -1,10 +1,10 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- this is a HobbyKing Bixler equiped with
-  * Autopilot:   Lisa/M 2.0         http://paparazzi.enac.fr/wiki/Lisa/M_v20
-  * IMU:         Aspirin 2.1        http://paparazzi.enac.fr/wiki/AspirinIMU
-  * GPS:         Ublox              http://paparazzi.enac.fr/wiki/Subsystem/gps
-  * RC:          any PPM system     http://paparazzi.enac.fr/wiki/Subsystem/radio_control#PPM
+  * Autopilot:   Lisa/M 2.0         http://wiki.paparazziuav.org/wiki/Lisa/M_v20
+  * IMU:         Aspirin 2.1        http://wiki.paparazziuav.org/wiki/AspirinIMU
+  * GPS:         Ublox              http://wiki.paparazziuav.org/wiki/Subsystem/gps
+  * RC:          any PPM system     http://wiki.paparazziuav.org/wiki/Subsystem/radio_control#PPM
   * Modem        XBee in transparent mode at 57600 baud
 -->
 
diff --git a/conf/airframes/examples/delta_wing_minimal.xml b/conf/airframes/examples/delta_wing_minimal.xml
index 605589ad31..3b2a94c9c3 100644
--- a/conf/airframes/examples/delta_wing_minimal.xml
+++ b/conf/airframes/examples/delta_wing_minimal.xml
@@ -1,9 +1,9 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- Funjet Multiplex (http://www.multiplex-rc.de/), Jeti ECO 25
-     Tiny 2.11 board (http://paparazzi.enac.fr/wiki/Tiny_v2)
+     Tiny 2.11 board (http://wiki.paparazziuav.org/wiki/Tiny_v2)
      PerkinElmer TPS334 IR Sensors
-     Tilted infrared sensor (http://paparazzi.enac.fr/wiki/Image:Tiny_v2_1_Funjet.jpg)
+     Tilted infrared sensor (http://wiki.paparazziuav.org/wiki/Image:Tiny_v2_1_Funjet.jpg)
      XBee modem with AT firmware
      LEA 5H GPS
 -->
diff --git a/conf/airframes/examples/funjet.xml b/conf/airframes/examples/funjet.xml
index c99707e1e4..151f823b26 100644
--- a/conf/airframes/examples/funjet.xml
+++ b/conf/airframes/examples/funjet.xml
@@ -1,9 +1,9 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- Funjet Multiplex (http://www.multiplex-rc.de/), Jeti ECO 25
-     Tiny 2.11 board (http://paparazzi.enac.fr/wiki/Tiny_v2)
+     Tiny 2.11 board (http://wiki.paparazziuav.org/wiki/Tiny_v2)
      PerkinElmer TPS334 IR Sensors
-     Tilted infrared sensor (http://paparazzi.enac.fr/wiki/Image:Tiny_v2_1_Funjet.jpg)
+     Tilted infrared sensor (http://wiki.paparazziuav.org/wiki/Image:Tiny_v2_1_Funjet.jpg)
      XBee modem with AT firmware
      LEA 5H GPS
 -->
diff --git a/conf/airframes/examples/funjet_cam.xml b/conf/airframes/examples/funjet_cam.xml
index f2674a8d81..df4f9fd492 100644
--- a/conf/airframes/examples/funjet_cam.xml
+++ b/conf/airframes/examples/funjet_cam.xml
@@ -1,9 +1,9 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- Funjet Multiplex (http://www.multiplex-rc.de/), Jeti ECO 25
-     Tiny 2.11 board (http://paparazzi.enac.fr/wiki/Tiny_v2)
+     Tiny 2.11 board (http://wiki.paparazziuav.org/wiki/Tiny_v2)
      PerkinElmer TPS334 IR Sensors
-     Tilted infrared sensor (http://paparazzi.enac.fr/wiki/Image:Tiny_v2_1_Funjet.jpg)
+     Tilted infrared sensor (http://wiki.paparazziuav.org/wiki/Image:Tiny_v2_1_Funjet.jpg)
      XBee modem with AT firmware
      LEA 5H GPS
 -->
diff --git a/conf/airframes/examples/krooz_sd/krooz_sd_bre_hexa_mkk.xml b/conf/airframes/examples/krooz_sd/krooz_sd_bre_hexa_mkk.xml
index 692eaafdb5..d1e6b8653a 100644
--- a/conf/airframes/examples/krooz_sd/krooz_sd_bre_hexa_mkk.xml
+++ b/conf/airframes/examples/krooz_sd/krooz_sd_bre_hexa_mkk.xml
@@ -227,7 +227,7 @@
     <define name="LOW_BAT_LEVEL" value="14.3" unit="V"/>
     <define name="MAX_BAT_LEVEL" value="16.8" unit="V"/>
     <!--uncomment next two lines together with a corresponding USE_ADC_2 define on the top of this file to use a current sensor
-        (more about is here http://paparazzi.enac.fr/wiki/Sensors/Current) -->
+        (more about is here http://wiki.paparazziuav.org/wiki/Sensors/Current) -->
     <!--
     <define name="ADC_CHANNEL_CURRENT" value="ADC_2"/>
     <define name="MilliAmpereOfAdc(adc)" value="Max(0,(3100 - adc)*20)"/>
diff --git a/conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml b/conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
index d20c6958cf..63ca1a8062 100644
--- a/conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
+++ b/conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
@@ -227,7 +227,7 @@
     <define name="LOW_BAT_LEVEL" value="14.3" unit="V"/>
     <define name="MAX_BAT_LEVEL" value="16.8" unit="V"/>
     <!--uncomment next two lines together with a corresponding USE_ADC_2 define on the top of this file to use a current sensor
-        (more about is here http://paparazzi.enac.fr/wiki/Sensors/Current) -->
+        (more about is here http://wiki.paparazziuav.org/wiki/Sensors/Current) -->
     <!--
     <define name="ADC_CHANNEL_CURRENT" value="ADC_2"/>
     <define name="MilliAmpereOfAdc(adc)" value="Max(0,(3100 - adc)*20)"/>
diff --git a/conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml b/conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
index ee0dfca4e8..227aa284cf 100644
--- a/conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
+++ b/conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
@@ -232,7 +232,7 @@
     <define name="LOW_BAT_LEVEL" value="13.2" unit="V"/>
     <define name="MAX_BAT_LEVEL" value="16.8" unit="V"/>
     <!--uncomment next two lines together with a corresponding USE_ADC_2 define on the top of this file to use a current sensor
-        (more about is here http://paparazzi.enac.fr/wiki/Sensors/Current) -->
+        (more about is here http://wiki.paparazziuav.org/wiki/Sensors/Current) -->
     <!--
     <define name="ADC_CHANNEL_CURRENT" value="ADC_2"/>
     <define name="MilliAmpereOfAdc(adc)" value="Max(0,(3100 - adc)*20)"/>
diff --git a/conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml b/conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
index c35543bb20..5f40f6a3c0 100644
--- a/conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
+++ b/conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
@@ -229,7 +229,7 @@
     <define name="LOW_BAT_LEVEL" value="14.2" unit="V"/>
     <define name="MAX_BAT_LEVEL" value="16.8" unit="V"/>
     <!--uncomment next two lines together with a corresponding USE_ADC_2 define on the top of this file to use a current sensor
-        (more about is here http://paparazzi.enac.fr/wiki/Sensors/Current) -->
+        (more about is here http://wiki.paparazziuav.org/wiki/Sensors/Current) -->
     <!--
     <define name="ADC_CHANNEL_CURRENT" value="ADC_2"/>
     <define name="MilliAmpereOfAdc(adc)" value="Max(0,(3100 - adc)*20)"/>
diff --git a/conf/airframes/examples/microjet.xml b/conf/airframes/examples/microjet.xml
index 9d566f91f1..276f927524 100644
--- a/conf/airframes/examples/microjet.xml
+++ b/conf/airframes/examples/microjet.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- Microjet Multiplex (http://www.multiplex-rc.de/)
-     Tiny 1.1 board (http://paparazzi.enac.fr/wiki/Tiny)
+     Tiny 1.1 board (http://wiki.paparazziuav.org/wiki/Tiny)
      Tilted infrared sensor
      Xbee modem in API mode
 -->
diff --git a/conf/airframes/examples/microjet_imu_xsens.xml b/conf/airframes/examples/microjet_imu_xsens.xml
index e7c7f47961..1ab3a1316b 100644
--- a/conf/airframes/examples/microjet_imu_xsens.xml
+++ b/conf/airframes/examples/microjet_imu_xsens.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- Microjet Multiplex (http://www.multiplex-rc.de/)
-     Lisa/M v1.0 board (http://paparazzi.enac.fr/wiki/Lisa/M_v10)
+     Lisa/M v1.0 board (http://wiki.paparazziuav.org/wiki/Lisa/M_v10)
      Xsens running as IMU
      Xbee modem in transparent mode
 -->
diff --git a/conf/airframes/examples/microjet_lisa_m.xml b/conf/airframes/examples/microjet_lisa_m.xml
index d1c626065b..491b8367c9 100644
--- a/conf/airframes/examples/microjet_lisa_m.xml
+++ b/conf/airframes/examples/microjet_lisa_m.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- Microjet Multiplex (http://www.multiplex-rc.de/)
-     Lisa/M v2.0 board (http://paparazzi.enac.fr/wiki/Lisa/M_v20)
+     Lisa/M v2.0 board (http://wiki.paparazziuav.org/wiki/Lisa/M_v20)
      Aspirin IMU v2.2 with MS5611 barometer
      Xbee modem in transparent mode
 -->
diff --git a/conf/airframes/examples/microjet_lisa_m_xsens.xml b/conf/airframes/examples/microjet_lisa_m_xsens.xml
index 567efac712..ee9ddd2269 100644
--- a/conf/airframes/examples/microjet_lisa_m_xsens.xml
+++ b/conf/airframes/examples/microjet_lisa_m_xsens.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- Microjet Multiplex (http://www.multiplex-rc.de/)
-     Lisa/M v1.0 board (http://paparazzi.enac.fr/wiki/Lisa/M_v10)
+     Lisa/M v1.0 board (http://wiki.paparazziuav.org/wiki/Lisa/M_v10)
      Xsens as full INS
      Xbee modem in transparent mode
 -->
diff --git a/conf/airframes/examples/microjet_twog_aspirin.xml b/conf/airframes/examples/microjet_twog_aspirin.xml
index d5b4bbe972..d89003ecab 100644
--- a/conf/airframes/examples/microjet_twog_aspirin.xml
+++ b/conf/airframes/examples/microjet_twog_aspirin.xml
@@ -1,8 +1,8 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- Microjet Multiplex (http://www.multiplex-rc.de/)
-     Twog 1.0 board (http://paparazzi.enac.fr/wiki/TWOG/v1.0)
-     Aspirin v1.5 (http://paparazzi.enac.fr/wiki/AspirinIMU)
+     Twog 1.0 board (http://wiki.paparazziuav.org/wiki/TWOG/v1.0)
+     Aspirin v1.5 (http://wiki.paparazziuav.org/wiki/AspirinIMU)
      Xbee modem in transparent mode
 -->
 
diff --git a/conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml b/conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
index 67e106c3a1..4310f31007 100644
--- a/conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
+++ b/conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
@@ -1,11 +1,11 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- this is a quadrotor frame equiped with
-     * Autopilot:   Lisa/M 2.0             http://paparazzi.enac.fr/wiki/Lisa/M_v20
-     * IMU:         Aspirin 2.2            http://paparazzi.enac.fr/wiki/AspirinIMU
-     * Actuators:   PWM motor controllers  http://paparazzi.enac.fr/wiki/Subsystem/actuators#PWM_Supervision
-     * GPS:         Ublox                  http://paparazzi.enac.fr/wiki/Subsystem/gps
-     * RC:          two Spektrum sats      http://paparazzi.enac.fr/wiki/Subsystem/radio_control#Spektrum
+     * Autopilot:   Lisa/M 2.0             http://wiki.paparazziuav.org/wiki/Lisa/M_v20
+     * IMU:         Aspirin 2.2            http://wiki.paparazziuav.org/wiki/AspirinIMU
+     * Actuators:   PWM motor controllers  http://wiki.paparazziuav.org/wiki/Subsystem/actuators#PWM_Supervision
+     * GPS:         Ublox                  http://wiki.paparazziuav.org/wiki/Subsystem/gps
+     * RC:          two Spektrum sats      http://wiki.paparazziuav.org/wiki/Subsystem/radio_control#Spektrum
 -->
 
 <airframe name="Quadrotor LisaM_2.0 pwm">
diff --git a/conf/airframes/examples/quadrotor_lisa_m_mkk.xml b/conf/airframes/examples/quadrotor_lisa_m_mkk.xml
index a1397f98d5..77c8c26419 100644
--- a/conf/airframes/examples/quadrotor_lisa_m_mkk.xml
+++ b/conf/airframes/examples/quadrotor_lisa_m_mkk.xml
@@ -1,11 +1,11 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- this is a quadrotor frame equiped with
-     * Autopilot:   Lisa/M 1.0             http://paparazzi.enac.fr/wiki/Lisa/M_v10
-     * IMU:         Aspirin 1.5            http://paparazzi.enac.fr/wiki/AspirinIMU
-     * Actuators:   MKK motor controllers  http://paparazzi.enac.fr/wiki/Subsystem/actuators#MKK
-     * GPS:         Ublox                  http://paparazzi.enac.fr/wiki/Subsystem/gps
-     * RC:          any PPM system         http://paparazzi.enac.fr/wiki/Subsystem/radio_control#PPM
+     * Autopilot:   Lisa/M 1.0             http://wiki.paparazziuav.org/wiki/Lisa/M_v10
+     * IMU:         Aspirin 1.5            http://wiki.paparazziuav.org/wiki/AspirinIMU
+     * Actuators:   MKK motor controllers  http://wiki.paparazziuav.org/wiki/Subsystem/actuators#MKK
+     * GPS:         Ublox                  http://wiki.paparazziuav.org/wiki/Subsystem/gps
+     * RC:          any PPM system         http://wiki.paparazziuav.org/wiki/Subsystem/radio_control#PPM
 -->
 
 <airframe name="Quadrotor LisaM_1.0 mkk">
diff --git a/conf/airframes/examples/quadrotor_px4fmu.xml b/conf/airframes/examples/quadrotor_px4fmu.xml
index e107ded26a..432335140f 100644
--- a/conf/airframes/examples/quadrotor_px4fmu.xml
+++ b/conf/airframes/examples/quadrotor_px4fmu.xml
@@ -2,10 +2,10 @@
 
 <!-- this is a quadrotor frame equiped with
      * Autopilot:   PX4FMU 1.7             https://pixhawk.ethz.ch/px4/modules/px4fmu
-     * IMU:         MPU6000 + HMC5883      http://paparazzi.enac.fr/wiki/AspirinIMU
-     * Actuators:   PWM motor controllers  http://paparazzi.enac.fr/wiki/Subsystem/actuators#PWM_Supervision
-     * GPS:         Ublox                  http://paparazzi.enac.fr/wiki/Subsystem/gps
-     * RC:          PPM                    http://paparazzi.enac.fr/wiki/Subsystem/radio_control#PPM
+     * IMU:         MPU6000 + HMC5883      http://wiki.paparazziuav.org/wiki/AspirinIMU
+     * Actuators:   PWM motor controllers  http://wiki.paparazziuav.org/wiki/Subsystem/actuators#PWM_Supervision
+     * GPS:         Ublox                  http://wiki.paparazziuav.org/wiki/Subsystem/gps
+     * RC:          PPM                    http://wiki.paparazziuav.org/wiki/Subsystem/radio_control#PPM
 -->
 
 <airframe name="Quadrotor PX4FMU 1.7">
diff --git a/conf/airframes/examples/twinjet.xml b/conf/airframes/examples/twinjet.xml
index 874be440ee..44de04e738 100644
--- a/conf/airframes/examples/twinjet.xml
+++ b/conf/airframes/examples/twinjet.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- Twinjet Multiplex (http://www.multiplex-rc.de/)
-     Twog v1 board (http://paparazzi.enac.fr/wiki/Twog_v1)
+     Twog v1 board (http://wiki.paparazziuav.org/wiki/Twog_v1)
      PerkinElmer TPS334 IR Sensors
      Aligned infrared sensor
      XBee modem with AT firmware
diff --git a/conf/airframes/examples/twog_analogimu.xml b/conf/airframes/examples/twog_analogimu.xml
index 41a6546ca8..0c44eec524 100644
--- a/conf/airframes/examples/twog_analogimu.xml
+++ b/conf/airframes/examples/twog_analogimu.xml
@@ -5,7 +5,7 @@
     Use telemetry/default_fixedwing_imu.xml
 
      Reely Condor
-     TWOG v1.0 Board (http://paparazzi.enac.fr/wiki/TWOG)
+     TWOG v1.0 Board (http://wiki.paparazziuav.org/wiki/TWOG)
      Sparkfun Razor IMU with Premerlani Code
      wi.232 Radiomodems
 -->
diff --git a/conf/airframes/flixr_discovery.xml b/conf/airframes/flixr_discovery.xml
index a607348030..213b340795 100644
--- a/conf/airframes/flixr_discovery.xml
+++ b/conf/airframes/flixr_discovery.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE airframe SYSTEM "airframe.dtd">
 <!-- ST Model Discovery (http://www.sheng-teng.com/)
-     TWOG1  (http://paparazzi.enac.fr/wiki/TWOG/v1.0)
+     TWOG1  (http://wiki.paparazziuav.org/wiki/TWOG/v1.0)
      * uBlox LEA5H and Sarantel helix GPS antenna
 
 -->
diff --git a/conf/airframes/jsbsim.xml b/conf/airframes/jsbsim.xml
index b74262faba..71557b7608 100644
--- a/conf/airframes/jsbsim.xml
+++ b/conf/airframes/jsbsim.xml
@@ -1,8 +1,8 @@
 <!DOCTYPE airframe SYSTEM "airframe.dtd">
 
 <!-- Funjet Multiplex (http://www.multiplex-rc.de/)
-     Tiny 2.1 board (http://paparazzi.enac.fr/wiki/index.php/Tiny_v2)
-     Tilted infrared sensor (http://paparazzi.enac.fr/wiki/index.php/Image:Tiny_v2_1_Funjet.jpg)
+     Tiny 2.1 board (http://wiki.paparazziuav.org/wiki/index.php/Tiny_v2)
+     Tilted infrared sensor (http://wiki.paparazziuav.org/wiki/index.php/Image:Tiny_v2_1_Funjet.jpg)
      Radiotronix modem
 -->
 
diff --git a/conf/airframes/twinjet_overo.xml b/conf/airframes/twinjet_overo.xml
index ec388c7d1c..21b49f2d4b 100644
--- a/conf/airframes/twinjet_overo.xml
+++ b/conf/airframes/twinjet_overo.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE airframe SYSTEM "airframe.dtd">
 
 <!-- Twinjet Multiplex (http://www.multiplex-rc.de/)
-     Twog v1 board (http://paparazzi.enac.fr/wiki/Twog_v1)
+     Twog v1 board (http://wiki.paparazziuav.org/wiki/Twog_v1)
      PerkinElmer TPS334 IR Sensors
      Aligned infrared sensor
      XBee modem with AT firmware
diff --git a/conf/boards/ardrone2_raw.makefile b/conf/boards/ardrone2_raw.makefile
index 4d6fdaa5e9..688bec5fe5 100644
--- a/conf/boards/ardrone2_raw.makefile
+++ b/conf/boards/ardrone2_raw.makefile
@@ -2,7 +2,7 @@
 #
 # ardrone2_raw.makefile
 #
-# http://paparazzi.enac.fr/wiki/AR.Drone_2_-_Specifications
+# http://wiki.paparazziuav.org/wiki/AR.Drone_2_-_Specifications
 #
 
 BOARD=ardrone
diff --git a/conf/boards/ardrone2_sdk.makefile b/conf/boards/ardrone2_sdk.makefile
index 8e2ee43f7e..595c09125a 100644
--- a/conf/boards/ardrone2_sdk.makefile
+++ b/conf/boards/ardrone2_sdk.makefile
@@ -2,7 +2,7 @@
 #
 # ardrone2_sdk.makefile
 #
-# http://paparazzi.enac.fr/wiki/AR.Drone_2_-_Specifications
+# http://wiki.paparazziuav.org/wiki/AR.Drone_2_-_Specifications
 #
 
 BOARD=ardrone
diff --git a/conf/boards/booz_1.0.makefile b/conf/boards/booz_1.0.makefile
index ba14c85c18..3593821abf 100644
--- a/conf/boards/booz_1.0.makefile
+++ b/conf/boards/booz_1.0.makefile
@@ -1,7 +1,7 @@
 #
 # booz_1.0.makefile
 #
-# http://paparazzi.enac.fr/wiki/Booz
+# http://wiki.paparazziuav.org/wiki/Booz
 #
 ARCH=lpc21
 BOARD=booz
diff --git a/conf/boards/classix.makefile b/conf/boards/classix.makefile
index 6faac25ca7..a1af2f9b8a 100644
--- a/conf/boards/classix.makefile
+++ b/conf/boards/classix.makefile
@@ -1,7 +1,7 @@
 #
 # classix.makefile
 #
-# http://paparazzi.enac.fr/wiki/Classix
+# http://wiki.paparazziuav.org/wiki/Classix
 #
 
 ARCH=lpc21
diff --git a/conf/boards/hb_1.1.makefile b/conf/boards/hb_1.1.makefile
index 5f142cdf2f..1ef9841ffe 100644
--- a/conf/boards/hb_1.1.makefile
+++ b/conf/boards/hb_1.1.makefile
@@ -1,7 +1,7 @@
 #
 # hb_1.1.makefile
 #
-# http://paparazzi.enac.fr/wiki/HB_v1
+# http://wiki.paparazziuav.org/wiki/HB_v1
 #
 ARCH=lpc21
 BOARD=hb
diff --git a/conf/boards/lia_1.1.makefile b/conf/boards/lia_1.1.makefile
index 4e9eff239c..2e7d60f8dd 100644
--- a/conf/boards/lia_1.1.makefile
+++ b/conf/boards/lia_1.1.makefile
@@ -2,7 +2,7 @@
 #
 # lia1.1.makefile
 #
-# http://paparazzi.enac.fr/wiki/Lia
+# http://wiki.paparazziuav.org/wiki/Lia
 #
 
 BOARD=lia
diff --git a/conf/boards/lisa_l_1.0.makefile b/conf/boards/lisa_l_1.0.makefile
index 498354ee1f..3b8092e683 100644
--- a/conf/boards/lisa_l_1.0.makefile
+++ b/conf/boards/lisa_l_1.0.makefile
@@ -2,7 +2,7 @@
 #
 # lisa_l_1.0.makefile
 #
-# http://paparazzi.enac.fr/wiki/User/LisaL
+# http://wiki.paparazziuav.org/wiki/User/LisaL
 #
 
 BOARD=lisa_l
diff --git a/conf/boards/lisa_l_1.1.makefile b/conf/boards/lisa_l_1.1.makefile
index ccc1e9ae07..44e2b58cca 100644
--- a/conf/boards/lisa_l_1.1.makefile
+++ b/conf/boards/lisa_l_1.1.makefile
@@ -2,7 +2,7 @@
 #
 # lisa_l_1.1.makefile
 #
-# http://paparazzi.enac.fr/wiki/User/LisaL
+# http://wiki.paparazziuav.org/wiki/User/LisaL
 #
 
 
diff --git a/conf/boards/lisa_m_1.0.makefile b/conf/boards/lisa_m_1.0.makefile
index 9cd2039295..82fef6cca4 100644
--- a/conf/boards/lisa_m_1.0.makefile
+++ b/conf/boards/lisa_m_1.0.makefile
@@ -2,7 +2,7 @@
 #
 # lisa_m_1.0.makefile
 #
-# http://paparazzi.enac.fr/wiki/Lisa/M
+# http://wiki.paparazziuav.org/wiki/Lisa/M
 #
 
 BOARD=lisa_m
diff --git a/conf/boards/lisa_m_2.0.makefile b/conf/boards/lisa_m_2.0.makefile
index 4ea88c38fe..bc5779c363 100644
--- a/conf/boards/lisa_m_2.0.makefile
+++ b/conf/boards/lisa_m_2.0.makefile
@@ -2,7 +2,7 @@
 #
 # lisa_m_2.0.makefile
 #
-# http://paparazzi.enac.fr/wiki/Lisa/M_v20
+# http://wiki.paparazziuav.org/wiki/Lisa/M_v20
 #
 
 BOARD=lisa_m
diff --git a/conf/boards/lisa_m_2.1.makefile b/conf/boards/lisa_m_2.1.makefile
index 17e479f32f..593d6a10c8 100644
--- a/conf/boards/lisa_m_2.1.makefile
+++ b/conf/boards/lisa_m_2.1.makefile
@@ -2,7 +2,7 @@
 #
 # lisa_m_2.1.makefile
 #
-# http://paparazzi.enac.fr/wiki/Lisa/M_v21
+# http://wiki.paparazziuav.org/wiki/Lisa/M_v21
 #
 
 BOARD=lisa_m
diff --git a/conf/boards/lisa_mx_2.0.makefile b/conf/boards/lisa_mx_2.0.makefile
index f453ef7119..45c2726493 100644
--- a/conf/boards/lisa_mx_2.0.makefile
+++ b/conf/boards/lisa_mx_2.0.makefile
@@ -2,7 +2,7 @@
 #
 # lisa_mx_2.0.makefile
 #
-# http://paparazzi.enac.fr/wiki/Lisa/M_v20
+# http://wiki.paparazziuav.org/wiki/Lisa/M_v20
 #
 
 BOARD=lisa_mx
diff --git a/conf/boards/lisa_mx_2.1.makefile b/conf/boards/lisa_mx_2.1.makefile
index ad11ad4ac4..dca2fbc4d0 100644
--- a/conf/boards/lisa_mx_2.1.makefile
+++ b/conf/boards/lisa_mx_2.1.makefile
@@ -2,7 +2,7 @@
 #
 # lisa_mx_2.1.makefile
 #
-# http://paparazzi.enac.fr/wiki/Lisa/M_v20
+# http://wiki.paparazziuav.org/wiki/Lisa/M_v20
 #
 
 BOARD=lisa_mx
diff --git a/conf/boards/navstik_1.0.makefile b/conf/boards/navstik_1.0.makefile
index a8ab68ce48..53aa9f458f 100644
--- a/conf/boards/navstik_1.0.makefile
+++ b/conf/boards/navstik_1.0.makefile
@@ -2,7 +2,7 @@
 #
 # navstik_1.0.makefile
 #
-# http://paparazzi.enac.fr/wiki/Navstik
+# http://wiki.paparazziuav.org/wiki/Navstik
 #
 
 BOARD=navstik
diff --git a/conf/boards/tiny_0.99.makefile b/conf/boards/tiny_0.99.makefile
index e36143cb28..f5a2b42af6 100644
--- a/conf/boards/tiny_0.99.makefile
+++ b/conf/boards/tiny_0.99.makefile
@@ -1,7 +1,7 @@
 #
 # tiny_0.99.makefile
 #
-# http://paparazzi.enac.fr/wiki/Tiny_v0.99
+# http://wiki.paparazziuav.org/wiki/Tiny_v0.99
 #
 
 ARCH=lpc21
diff --git a/conf/boards/tiny_1.1.makefile b/conf/boards/tiny_1.1.makefile
index e3bb3985a4..2f49f838b7 100644
--- a/conf/boards/tiny_1.1.makefile
+++ b/conf/boards/tiny_1.1.makefile
@@ -1,7 +1,7 @@
 #
 # tiny_1.1.makefile
 #
-# http://paparazzi.enac.fr/wiki/Tiny_v1.1
+# http://wiki.paparazziuav.org/wiki/Tiny_v1.1
 #
 ARCH=lpc21
 
diff --git a/conf/boards/tiny_2.1.makefile b/conf/boards/tiny_2.1.makefile
index 5c6d7f838a..fbf0a72706 100644
--- a/conf/boards/tiny_2.1.makefile
+++ b/conf/boards/tiny_2.1.makefile
@@ -1,7 +1,7 @@
 #
 # tiny_2.1.makefile
 #
-# http://paparazzi.enac.fr/wiki/Tiny_v2
+# http://wiki.paparazziuav.org/wiki/Tiny_v2
 #
 
 ARCH=lpc21
diff --git a/conf/boards/tiny_2.11.makefile b/conf/boards/tiny_2.11.makefile
index fa12c6e374..c1138c440c 100644
--- a/conf/boards/tiny_2.11.makefile
+++ b/conf/boards/tiny_2.11.makefile
@@ -1,7 +1,7 @@
 #
 # tiny_2.11.makefile
 #
-# http://paparazzi.enac.fr/wiki/Tiny_v2
+# http://wiki.paparazziuav.org/wiki/Tiny_v2
 #
 
 ARCH=lpc21
diff --git a/conf/boards/twog_1.0.makefile b/conf/boards/twog_1.0.makefile
index f1251fb239..e3bc637cf6 100644
--- a/conf/boards/twog_1.0.makefile
+++ b/conf/boards/twog_1.0.makefile
@@ -1,7 +1,7 @@
 #
 # twog_1.0.makefile
 #
-# http://paparazzi.enac.fr/wiki/Twog_v1
+# http://wiki.paparazziuav.org/wiki/Twog_v1
 #
 
 ARCH=lpc21
diff --git a/conf/boards/yapa_2.0.makefile b/conf/boards/yapa_2.0.makefile
index 85aa8a9133..481b869435 100644
--- a/conf/boards/yapa_2.0.makefile
+++ b/conf/boards/yapa_2.0.makefile
@@ -1,7 +1,7 @@
 #
 # yapa_2.0.makefile
 #
-# http://paparazzi.enac.fr/wiki/YAPA/v2.0
+# http://wiki.paparazziuav.org/wiki/YAPA/v2.0
 #
 
 ARCH=lpc21