diff --git a/Makefile b/Makefile
index 1bfba3939..03b87c926 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@ PREFIX = $(INSDIR)
 
 BUILDDIR = $(ACK_TEMP_DIR)/ack-build
 
-# What build flags do you want to use?
+# What build flags do you want to use for native code?
 
-CFLAGS = -g
+CFLAGS = -g -O -Wno-return-type
 LDFLAGS = 
 
 # Various commands.
@@ -120,6 +120,7 @@ $(build-file): first/ackbuilder.lua Makefile $(lua-files) $(our-lua)
 		PREFIX=$(PREFIX) \
 		AR=$(AR) \
 		CC=$(CC) \
+		CFLAGS="$(CFLAGS)" \
 		> $(build-file)
 
 install:
diff --git a/build.lua b/build.lua
index 1e2405907..f1a1a20e3 100644
--- a/build.lua
+++ b/build.lua
@@ -1,5 +1,5 @@
 vars.cflags = {
-	"-g", "-O"
+	"$CFLAGS"
 }
 vars.ackcflags = {
 	"-O6"