diff --git a/Makefile b/Makefile
index 89094c3b6..761e884f0 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ HOSTAR:=ar
 
 # Base CFLAGS, without arch. We'll need it for luajit, because its Makefiles do some tricky stuff to differentiate HOST/TARGET
 BASE_CFLAGS:=-O2 -ffast-math -pipe
-KOPT_CFLAGS:=-O3 -ffast-math -pipe
+KOPT_CFLAGS:=-O3 -ffast-math -fno-finite-math-only -pipe
 # Use this for debugging:
 #BASE_CFLAGS:=-O0 -g
 # Misc GCC tricks to ensure backward compatibility with the K2, even when using a fairly recent TC (Linaro/MG).