diff --git a/Editor/Makefile b/Editor/Makefile
index b67c24746c..78035e4189 100644
--- a/Editor/Makefile
+++ b/Editor/Makefile
@@ -6,15 +6,16 @@ OBJS = \
 	FileReader.o \
 	Editor.o \
 	main.o \
-        InsertOperation.o \
-        Operation.o \
-        UndoStack.o
+    InsertOperation.o \
+    Operation.o \
+    UndoStack.o
 
-CXXFLAGS = -Os -std=c++1z -W -Wall -g -I../AK
-LDFLAGS = -lncurses
+CXX = g++
+CXXFLAGS = -O2 -std=c++1z -W -Wall -g -I../AK
+LIBS = -lncurses
 
 $(BINARY): $(OBJS)
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 all: $(BINARY)