diff --git a/make/defs.mk b/make/defs.mk
index 1fd78b8a..0c4a957d 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -942,8 +942,8 @@ else
 endif
 
 ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
-	BUILD_CFLAGS      += -funroll-loops -O2
-	BUILD_CPPFLAGS    += -funroll-loops -O2
+	BUILD_CFLAGS      += -funroll-loops -O3
+	BUILD_CPPFLAGS    += -funroll-loops -O3
 else
 	NO_OPT_FLAGS = \
 		-O0 -g -fno-inline -fno-omit-frame-pointer -fno-builtin -fno-optimize-sibling-calls \
@@ -1076,7 +1076,10 @@ echo-vars:
 	make -p nothing | grep -B1 "^[A-Z_]* *[?:+]*="
 
 echo-makefiles:
-	strace -f make nothing 2>&1 | sed '/open\(at\)*(.*\(Makefile\|\.mk\)/ !d; s/.*open("//; s/.*openat([A-Z_]\+, "//; s/", O_.*//'
+	$(Q)strace -f make nothing 2>&1 | sed '/open\(at\)*(.*\(Makefile\|\.mk\)/ !d; s/.*open("//; s/.*openat([A-Z_]\+, "//; s/", O_.*//'
+
+cat-makefiles:
+	Q=@ make --no-print-directory echo-makefiles | while read f; do echo "# =================================================== $$f"; cat $$f; done
 
 doc-module:
 	$(BROWSER) $(JANWARE_URL_DOC_MODULE)