diff --git a/conf/autopilot/subsystems/fixedwing/autopilot.makefile b/conf/autopilot/subsystems/fixedwing/autopilot.makefile
index 688c5b4250..280e76b4d1 100644
--- a/conf/autopilot/subsystems/fixedwing/autopilot.makefile
+++ b/conf/autopilot/subsystems/fixedwing/autopilot.makefile
@@ -176,8 +176,6 @@ sim.srcs 		+= downlink.c datalink.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/ivy_transp
 JSBSIM_ROOT = /opt/jsbsim
 JSBSIM_INC = $(JSBSIM_ROOT)/include/JSBSim
 JSBSIM_LIB = $(JSBSIM_ROOT)/lib
-jsbsim.ARCHDIR = $(ARCHI)
-#jsbsim.ARCH = sitl
 
 jsbsim.CFLAGS 		+= $(fbw_CFLAGS) $(ap_CFLAGS)
 jsbsim.srcs 		+= $(fbw_srcs) $(ap_srcs)
diff --git a/conf/boards/pc.makefile b/conf/boards/pc.makefile
index 894f6a0dd6..0ec1c34d43 100644
--- a/conf/boards/pc.makefile
+++ b/conf/boards/pc.makefile
@@ -14,7 +14,7 @@ BOARD_VERSION=
 BOARD_CFG = \"tiny.h\"
 
 
-sim.ARCHDIR = $(ARCHI)
+$(TARGET).ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
 sim.TARGET = autopilot
 sim.TARGETDIR = autopilot