diff --git a/conf/Makefile.stm32 b/conf/Makefile.stm32
index 23006106ec9..f82913db438 100644
--- a/conf/Makefile.stm32
+++ b/conf/Makefile.stm32
@@ -130,7 +130,7 @@ AFLAGS += -mcpu=$(MCU) -mthumb
 endif
 AFLAGS += -x assembler-with-cpp -Wa,-adhlns=$(OBJDIR)/$(<:.S=.lst),--g$(DEBUG)
 
-LDFLAGS = -L../ext/libopencm3/lib/stm32/f1
+LDFLAGS = -L../ext/libopencm3/lib
 ifeq ("$(MULTILIB)","yes")
 LDFLAGS += -T$(LDSCRIPT) -nostartfiles -O$(OPT) -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
 else
diff --git a/sw/ext/libopencm3 b/sw/ext/libopencm3
index 7011d47c700..2b8fbfc433f 160000
--- a/sw/ext/libopencm3
+++ b/sw/ext/libopencm3
@@ -1 +1 @@
-Subproject commit 7011d47c70076f995e8470c59eeaa8f3efcc9f05
+Subproject commit 2b8fbfc433fe75efaa323d0b085e6d54a1221975