diff --git a/.gitmodules b/.gitmodules
index 0495623..34b4330 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,6 @@
 	path = fish/.config/fish/nvm-wrapper
 	url = https://github.com/passcod/nvm-fish-wrapper
 
+[submodule "emacs/.emacs.d/evil"]
+	path = emacs/.emacs.d/evil
+	url = https://github.com/emacs-evil/evil
diff --git a/Makefile b/Makefile
index 3bb75fa..1c7e99c 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ endif
 install:
 	@make $(UNAME)
 
-Linux: bash fish git mutt byobu weechat vim nvim gnupg bin
+Linux: bash fish git mutt byobu weechat vim nvim gnupg bin emacs
 Windows: bash git vim
 Other: bash git vim
 
@@ -32,6 +32,7 @@ clean:
 	stow -t "$$HOME" -D weechat
 	stow -t "$$HOME" -D gnupg
 	stow -t "$$HOME" -D bin
+	stow -t "$$HOME" -D emacs
 
 bash:
 	@printf "$(YELLOW)--- bash -----------------------------------------------\n$(RESET)"
@@ -76,6 +77,10 @@ bin:
 	@printf "$(YELLOW)--- bin ------------------------------------------------\n$(RESET)"
 	stow -t "$$HOME" bin
 
+emacs:
+	@printf "$(YELLOW)--- emacs ----------------------------------------------\n$(RESET)"
+	git submodule update --init -- emacs/.emacs.d/evil
+	stow -t "$$HOME" emacs
 
-.PHONY: bash fish git vim nvim mutt byobu weechat gnupg bin clean install Windows Linux Other
+.PHONY: bash fish git vim nvim mutt byobu weechat gnupg bin emacs clean install Windows Linux Other
 
diff --git a/emacs/.emacs b/emacs/.emacs
new file mode 100644
index 0000000..a7b9971
--- /dev/null
+++ b/emacs/.emacs
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "~/.emacs.d/evil")
+(require 'evil)
+(evil-mode 1)
+
diff --git a/emacs/.emacs.d/evil b/emacs/.emacs.d/evil
new file mode 160000
index 0000000..6fde982
--- /dev/null
+++ b/emacs/.emacs.d/evil
@@ -0,0 +1 @@
+Subproject commit 6fde982d731e2cc4e5f6bded6f8955ab2daee3b7