diff --git a/conf/airframes/AirborneCodeReorg/TinyFw.xml b/conf/airframes/AirborneCodeReorg/TinyFw.xml
index fae3281eb9..94d627fa61 100644
--- a/conf/airframes/AirborneCodeReorg/TinyFw.xml
+++ b/conf/airframes/AirborneCodeReorg/TinyFw.xml
@@ -161,9 +161,7 @@
   </section>
 
   <firmware name="fixedwing">
-<!--
     <target name="sim" 			board="pc" />
--->
     <target name="ap" 			board="tiny_2.11">
       <param name="FLASH_MODE" 		value="IAP" />
       <define name="AGR_CLIMB" />
@@ -192,6 +190,7 @@
     </modules>
 
   </firmware>
+
 <!--
   <firmware name="setup">
     <target name="tunnel" 		board="tiny_2.11" />
diff --git a/conf/autopilot/sitl.makefile b/conf/autopilot/sitl.makefile
index 4f1d05dca6..b7749905b8 100644
--- a/conf/autopilot/sitl.makefile
+++ b/conf/autopilot/sitl.makefile
@@ -4,3 +4,6 @@ sim.TARGET = autopilot
 sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs += latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
+
+
+
diff --git a/conf/boards/pc.makefile b/conf/boards/pc.makefile
index bc7ee3c014..79a7842a61 100644
--- a/conf/boards/pc.makefile
+++ b/conf/boards/pc.makefile
@@ -14,5 +14,5 @@ sim.ARCH = sitl
 sim.TARGET = autopilot
 sim.TARGETDIR = autopilot
 
-
+sim.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 
diff --git a/conf/boards/tiny_2.11.makefile b/conf/boards/tiny_2.11.makefile
index 7c4f36a134..643ff2696a 100644
--- a/conf/boards/tiny_2.11.makefile
+++ b/conf/boards/tiny_2.11.makefile
@@ -31,8 +31,8 @@ LPC21ISP_XTAL = 12000
 ### default settings for tiny and twog
 GPS_UART_NR	= 0
 GPS_BAUD	= 38400
-MODEM_UART_NR = 1
-MODEM_BAUD = 57600
+MODEM_UART_NR	= 1
+MODEM_BAUD 	= 57600
 
 ADC_IR1 = ADC_1
 ADC_IR2 = ADC_2
diff --git a/sw/tools/gen_aircraft.ml b/sw/tools/gen_aircraft.ml
index 3588283906..7a266df6a9 100644
--- a/sw/tools/gen_aircraft.ml
+++ b/sw/tools/gen_aircraft.ml
@@ -186,7 +186,15 @@ let parse_firmware = fun makefile_ac tag firmware ->
                 (Xml.attrib c "value")
             end) in
 	  List.iter print_if_subsystem (Xml.children firmware);
-          fprintf makefile_ac "include $(PAPARAZZI_SRC)/conf/boards/%s.makefile\n" (Xml.attrib firmware "board")
+(**  	  let print_if_subsystem = (fun c ->
+            if ExtXml.tag_is c "define" then begin
+              fprintf makefile_ac "%s.CFLAGS += -D%s\n"
+                (String.uppercase(Xml.attrib tag "name"))
+                (Xml.attrib c "value")
+            end) in
+	  List.iter print_if_subsystem (Xml.children firmware);
+**)          fprintf makefile_ac "include $(PAPARAZZI_SRC)/conf/boards/%s.makefile\n" (Xml.attrib firmware "board");
+          fprintf makefile_ac "include $(PAPARAZZI_SRC)/conf/autopilot/%s.makefile\n" (Xml.attrib tag "name");
         with _ -> () end;
    | _ -> ()
 
@@ -199,7 +207,6 @@ let dump_target_section = fun xml makefile_ac ->
     if ExtXml.tag_is tag "firmware" then begin
       begin try
         fprintf makefile_ac "\n######################\n# makefile firmware '%s' \n" (Xml.attrib tag "name");
-        fprintf makefile_ac "include $(PAPARAZZI_SRC)/conf/autopilot/%s.makefile\n" (Xml.attrib tag "name");
 	List.iter (parse_firmware makefile_ac tag) (Xml.children tag )
       with _ -> () end;
     end)