diff --git a/Makefile b/Makefile
index 30086a7d..d3878bb3 100644
--- a/Makefile
+++ b/Makefile
@@ -161,9 +161,9 @@ CLK_INPUT=48000000
 CLK_FREQUENCY=48000000
 LPF=constraints/orange-crab.lpf
 PACKAGE=CSFBGA285
-NEXTPNR_FLAGS=--um5g-85k --freq 48
+NEXTPNR_FLAGS=--85k --speed 8 --freq 48
 OPENOCD_JTAG_CONFIG=openocd/olimex-arm-usb-tiny-h.cfg
-OPENOCD_DEVICE_CONFIG=openocd/LFE5UM5G-85F.cfg
+OPENOCD_DEVICE_CONFIG=openocd/LFE5UM-85F.cfg
 endif
 
 # ECP5-EVN
@@ -213,7 +213,7 @@ microwatt_out.config: microwatt.json $(LPF)
 	mv -f $@.tmp $@
 
 microwatt.bit: microwatt_out.config
-	$(ECPPACK) --svf microwatt.svf $< $@
+	$(ECPPACK) --compress --freq 38.8 --svf microwatt.svf $< $@
 
 microwatt.svf: microwatt.bit