diff --git a/Makefile b/Makefile
index 2690b0e..b588a98 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,9 @@
 #
 #----------------------------------------------------------------------
 
+EDITOR := vim
+
+
 # NOTE: The order here is important: 
 # 	- to avoid bootstrapping network connections gate must be the 
 # 	  first CT to get built to route the rest of CT's to the WAN