diff --git a/DSTAT/Makefile b/DSTAT/Makefile
index 87f0ebb9e6f1801692f80941f47ee72633e24ef0..617acc533bad4637e5e3c3afcb994e857ff4b4f5 100644
--- a/DSTAT/Makefile
+++ b/DSTAT/Makefile
@@ -487,9 +487,9 @@ rebuilddoc: cleandoc doc
 program: all flash
 
 # Flash µC - flash and disables JTAG
-AVRDUDE_FLAGS = -p x256a3u -c $(AVRDUDE_PROG) -P $(AVRDUDE_PORT) -U flash:w:dstat-firmware.hex:i -U fuse4:w:0xff:m
+AVRDUDE_FLAGS = -p $(AVRDUDE_DEV) -c $(AVRDUDE_PROG) -P $(AVRDUDE_PORT) -U flash:w:$(TARGET):e -U fuse4:w:0xff:m
 
-flash: $(TARGET).hex
+flash: $(TARGET)
 	avrdude $(AVRDUDE_FLAGS)
 
 
diff --git a/DSTAT/config.mk b/DSTAT/config.mk
index a0f9b72a34a44bc802ff998d5af396d2ae2a0b82..95d0626862dd83482fd529a82a1d078b52a1cd5b 100644
--- a/DSTAT/config.mk
+++ b/DSTAT/config.mk
@@ -44,6 +44,7 @@ MCU = atxmega256a3u
 F_CPU = 20000000
 
 # Programming settings
+AVRDUDE_DEV = x256a3u
 AVRDUDE_PROG = avrispmkII
 AVRDUDE_PORT = usb