diff --git a/Makefile b/Makefile
index 1bf5457..2631d50 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,7 @@
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-PREFIX		?= arm-none-eabi
-#PREFIX		?= arm-elf
+PREFIX		?= arm-none-eabi-
 
 TARGETS		:= stm32/f0 stm32/f1 stm32/f2 stm32/f3 stm32/f4
 TARGETS		+= stm32/l0 stm32/l1 stm32/l4
diff --git a/examples/rules.mk b/examples/rules.mk
index c1a5dad..435ac55 100644
--- a/examples/rules.mk
+++ b/examples/rules.mk
@@ -28,16 +28,16 @@ endif
 ###############################################################################
 # Executables
 
-PREFIX		?= arm-none-eabi
+PREFIX		?= arm-none-eabi-
 
-CC		:= $(PREFIX)-gcc
-CXX		:= $(PREFIX)-g++
-LD		:= $(PREFIX)-gcc
-AR		:= $(PREFIX)-ar
-AS		:= $(PREFIX)-as
-OBJCOPY		:= $(PREFIX)-objcopy
-OBJDUMP		:= $(PREFIX)-objdump
-GDB		:= $(PREFIX)-gdb
+CC		:= $(PREFIX)gcc
+CXX		:= $(PREFIX)g++
+LD		:= $(PREFIX)gcc
+AR		:= $(PREFIX)ar
+AS		:= $(PREFIX)as
+OBJCOPY		:= $(PREFIX)objcopy
+OBJDUMP		:= $(PREFIX)objdump
+GDB		:= $(PREFIX)gdb
 STFLASH		= $(shell which st-flash)
 STYLECHECK	:= /checkpatch.pl
 STYLECHECKFLAGS	:= --no-tree -f --terse --mailback
diff --git a/libopencm3 b/libopencm3
index 49a3cdd..7be50a5 160000
--- a/libopencm3
+++ b/libopencm3
@@ -1 +1 @@
-Subproject commit 49a3cddba0cf7ea9a6d14ad5e156583e982106e2
+Subproject commit 7be50a5e75ed2d163d38a6759347c5e778ac02ab