diff --git a/conf/airframes/CDW/yapa3_aspirin2.xml b/conf/airframes/CDW/yapa3_aspirin2.xml
index 152832dd54..a9fe19f48d 100644
--- a/conf/airframes/CDW/yapa3_aspirin2.xml
+++ b/conf/airframes/CDW/yapa3_aspirin2.xml
@@ -222,7 +222,7 @@
 
   <firmware name="fixedwing">
 
-    <target name="ap" board="tiny_2.11">
+    <target name="ap" board="yapa_2.0">
       <define name="STRONG_WIND"/>
       <define name="WIND_INFO"/>
       <define name="WIND_INFO_RET"/>
diff --git a/conf/airframes/CDW/yapa_xsens.xml b/conf/airframes/CDW/yapa_xsens.xml
index 2604ef5156..3f450eacc6 100644
--- a/conf/airframes/CDW/yapa_xsens.xml
+++ b/conf/airframes/CDW/yapa_xsens.xml
@@ -207,7 +207,7 @@
 
   <firmware name="fixedwing">
 
-    <target name="ap" board="tiny_2.11"/>
+    <target name="ap" board="yapa_2.0"/>
     <target name="sim" board="pc"/>
 
       <define name="STRONG_WIND"/>
diff --git a/conf/boards/yapa_2.0.makefile b/conf/boards/yapa_2.0.makefile
new file mode 100644
index 0000000000..04ce6147ff
--- /dev/null
+++ b/conf/boards/yapa_2.0.makefile
@@ -0,0 +1,83 @@
+#
+# yapa_2.0.makefile
+#
+# http://paparazzi.enac.fr/wiki/YAPA/v2.0
+#
+
+ARCH=lpc21
+
+BOARD=yapa
+BOARD_VERSION=2.0
+
+BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+
+
+ifndef FLASH_MODE
+FLASH_MODE = IAP
+endif
+
+
+LPC21ISP_BAUD = 38400
+LPC21ISP_XTAL = 12000
+
+#
+# default LED configuration
+#
+ifndef RADIO_CONTROL_LED
+RADIO_CONTROL_LED  = none
+endif
+
+ifndef BARO_LED
+BARO_LED = none
+endif
+
+ifndef AHRS_ALIGNER_LED
+AHRS_ALIGNER_LED = none
+endif
+
+ifndef GPS_LED
+GPS_LED = 2
+endif
+
+ifndef SYS_TIME_LED
+SYS_TIME_LED = 1
+endif
+
+
+#
+# default uart settings
+#
+ifndef GPS_PORT
+GPS_PORT	= UART0
+endif
+ifndef GPS_BAUD
+GPS_BAUD	= B38400
+endif
+
+ifndef MODEM_PORT
+MODEM_PORT	= UART1
+endif
+ifndef MODEM_BAUD
+MODEM_BAUD 	= B57600
+endif
+
+
+ADC_IR_TOP = ADC_0
+ADC_IR1 = ADC_1
+ADC_IR2 = ADC_2
+ADC_IR_NB_SAMPLES = 16
+ADC_GYRO_NB_SAMPLES = 16
+
+ADC_GENERIC_NB_SAMPLES = 16
+
+#
+# you can use different actuators by adding a configure option to your firmware section
+# e.g. <configure name="ACTUATORS" value="actuators_ppm/>
+#
+ifndef ACTUATORS
+ACTUATORS = actuators_4017
+endif
+
+
+# All targets on the TINY board run on the same processor achitecture
+$(TARGET).ARCHDIR = $(ARCH)
diff --git a/sw/airborne/boards/yapa_2.0.h b/sw/airborne/boards/yapa_2.0.h
new file mode 100644
index 0000000000..9fc0a0163c
--- /dev/null
+++ b/sw/airborne/boards/yapa_2.0.h
@@ -0,0 +1,6 @@
+#include "boards/tiny_2.1.h"
+
+
+// ADC / 1023 * 3.3V * (10k + 1k5) / 1k5
+#undef DefaultVoltageOfAdc
+#define DefaultVoltageOfAdc(adc) (0.0247311828*adc)