diff --git a/Makefile b/Makefile
index 766073d2..fe06961f 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,8 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX		?= arm-none-eabi
+#PREFIX		?= arm-elf
 DESTDIR		?= /usr/local
 INCDIR		= $(DESTDIR)/$(PREFIX)/include
 LIBDIR		= $(DESTDIR)/$(PREFIX)/lib
diff --git a/examples/lm3s/Makefile.include b/examples/lm3s/Makefile.include
index 764a145a..24248325 100644
--- a/examples/lm3s/Makefile.include
+++ b/examples/lm3s/Makefile.include
@@ -18,8 +18,8 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX		?= arm-none-eabi
+#PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy
diff --git a/examples/lpc13xx/Makefile.include b/examples/lpc13xx/Makefile.include
index c9ae180a..fe2c3ba0 100644
--- a/examples/lpc13xx/Makefile.include
+++ b/examples/lpc13xx/Makefile.include
@@ -18,8 +18,8 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX		?= arm-none-eabi
+#PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy
diff --git a/lib/lm3s/Makefile b/lib/lm3s/Makefile
index 2bdbd720..93a67ad9 100644
--- a/lib/lm3s/Makefile
+++ b/lib/lm3s/Makefile
@@ -19,8 +19,8 @@
 
 LIBNAME		= libopencm3_lm3s
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX		?= arm-none-eabi
+#PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 AR		= $(PREFIX)-ar
 CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \
diff --git a/lib/lpc13xx/Makefile b/lib/lpc13xx/Makefile
index 7181a08b..04e33c87 100644
--- a/lib/lpc13xx/Makefile
+++ b/lib/lpc13xx/Makefile
@@ -19,8 +19,8 @@
 
 LIBNAME		= libopencm3_lpc13xx
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX		?= arm-none-eabi
+#PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 AR		= $(PREFIX)-ar
 CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \
diff --git a/lib/stm32/Makefile b/lib/stm32/Makefile
index 095f5248..5f26c295 100644
--- a/lib/stm32/Makefile
+++ b/lib/stm32/Makefile
@@ -19,8 +19,8 @@
 
 LIBNAME		= libopencm3_stm32
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX		?= arm-none-eabi
+#PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 AR		= $(PREFIX)-ar
 CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \