diff --git a/source/Makefile.mk b/source/Makefile.mk
index f84d90cab..f7ef10c51 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -101,7 +101,7 @@ endif
 # Set build and link flags
 
 BASE_FLAGS = -Wall -Wextra -pipe -DBUILDING_CARLA -DREAL_BUILD -MD -MP
-BASE_OPTS  = -O2 -ffast-math -mtune=generic -msse -msse2 -mfpmath=sse -fdata-sections -ffunction-sections
+BASE_OPTS  = -O3 -ffast-math -mtune=generic -msse -msse2 -mfpmath=sse -fdata-sections -ffunction-sections
 
 ifeq ($(MACOS),true)
 # MacOS linker flags
@@ -116,13 +116,13 @@ endif
 
 ifeq ($(RASPPI),true)
 # Raspberry-Pi optimization flags
-BASE_OPTS  = -O2 -ffast-math -march=armv6 -mfpu=vfp -mfloat-abi=hard
+BASE_OPTS  = -O3 -ffast-math -march=armv6 -mfpu=vfp -mfloat-abi=hard
 LINK_OPTS  = -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
 endif
 
 ifeq ($(NOOPT),true)
-# No optimization flags
-BASE_OPTS  = -O2 -ffast-math -fdata-sections -ffunction-sections
+# No CPU-specific optimization flags
+BASE_OPTS  = -O3 -ffast-math -fdata-sections -ffunction-sections
 endif
 
 ifneq ($(WIN32),true)