diff --git a/Makefile b/Makefile
index 11563a0698..378f96deae 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ CFLAGS = -Wall
 ifdef DEBUG
 	CFLAGS += -g
 else
-	CFLAGS += -O3 -fomit-frame-pointer $(SITE_CFLAGS)
+	CFLAGS += -O3 $(SITE_CFLAGS)
 endif
 
 ifdef CONFIG
diff --git a/vm/Config.unix b/vm/Config.unix
index 831b3378d8..6400f4782d 100644
--- a/vm/Config.unix
+++ b/vm/Config.unix
@@ -1,3 +1,7 @@
+#ifndef DEBUG
+    C_FLAGS += -fomit-frame-pointer
+#endif
+
 EXE_SUFFIX =
 DLL_PREFIX = lib
 DLL_EXTENSION = .a