diff --git a/Makefile b/Makefile
index 1b30657..8e8a97a 100644
--- a/Makefile
+++ b/Makefile
@@ -37,14 +37,16 @@ BUILD_ID := $(shell tools/generate_build_id.py --arch $(SOCKS_ARCH))
 
 CWARNINGS := -Wall -Werror -pedantic -Wno-language-extension-token -Wno-unused-function  -Wno-gnu-statement-expression
 
-CFLAGS := $(CFLAGS) -DBUILD_ID=\"$(BUILD_ID)\" -g -fPIC -std=gnu17 \
+OPTIMISATION_LEVEL := -O2
+
+CFLAGS := $(CFLAGS) -DBUILD_ID=\"$(BUILD_ID)\" $(OPTIMISATION_LEVEL) -g -fPIC -std=gnu17 \
 	-Iinclude -Iarch/$(SOCKS_ARCH)/include -Ilibc/include $(CWARNINGS)
 
-CXXFLAGS := $(CXXFLAGS) -DBUILD_ID=\"$(BUILD_ID)\" -g -fPIC -std=gnu++17 \
+CXXFLAGS := $(CXXFLAGS) -DBUILD_ID=\"$(BUILD_ID)\" $(OPTIMISATION_LEVEL) -g -fPIC -std=gnu++17 \
 	-Iinclude -Iarch/$(SOCKS_ARCH)/include -Ilibc/include -Wno-language-extension-token $(CWARNINGS)
 
 ASMFLAGS := $(ASMFLAGS) -DBUILD_ID=\"$(BUILD_ID)\"
-LDFLAGS := $(LDFLAGS) -g -lgcc
+LDFLAGS := $(LDFLAGS) -g -lgcc $(OPTIMISATION_LEVEL)
 
 ALL_KERNEL_OBJECT_FILES := $(KERNEL_OBJ) $(ARCH_OBJ) $(LIBC_OBJ)
 ALL_KERNEL_DEPS := $(ALL_KERNEL_OBJECT_FILES:.o=.d)