diff --git a/Makefile b/Makefile
index 04f0d3f..194d256 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 include Makefile.common
 
 GCONFTOOL = gconftool-2
-EMACS     = emacs
 
 I3_DESTDIR = $(CONFIGDIR)/i3
 
@@ -70,34 +69,12 @@ install-bzr:
 install-xresources:
 	$(INSTALL) -m 0644 Xresources $(DESTDIR)/.Xresources
 
-install-emacs-configs:
-	$(INSTALL) -d $(DESTDIR)/.emacs.d/site-lisp
-	$(INSTALL) -d $(DESTDIR)/.emacs.d/scripts
-	rm -f  $(DESTDIR)/.emacs
-	$(INSTALL) -m 0644 emacs/init.el $(DESTDIR)/.emacs.d/init.el
-	$(INSTALL) -m 0644 emacs/early-init.el $(DESTDIR)/.emacs.d/early-init.el
-	$(INSTALL) -m 0644 emacs/site-lisp/mc-move.el $(DESTDIR)/.emacs.d/site-lisp
-	$(INSTALL) -m 0644 emacs/site-lisp/tools.el $(DESTDIR)/.emacs.d/site-lisp
-	$(INSTALL) -m 0644 emacs/site-lisp/my.el $(DESTDIR)/.emacs.d/site-lisp
-	$(INSTALL) -m 0644 emacs/site-lisp/manual-indent.el $(DESTDIR)/.emacs.d/site-lisp
-	$(INSTALL) -m 0644 emacs/site-lisp/zoom-frm.el $(DESTDIR)/.emacs.d/site-lisp
-	$(INSTALL) -m 0644 emacs/site-lisp/frame-fns.el $(DESTDIR)/.emacs.d/site-lisp
-	$(INSTALL) -m 0644 emacs/site-lisp/frame-cmds.el $(DESTDIR)/.emacs.d/site-lisp
-	$(INSTALL) -m 0644 emacs/site-lisp/yaml-xref.el $(DESTDIR)/.emacs.d/site-lisp
-	$(INSTALL) -m 0644 emacs/scripts/pyimpsort.py $(DESTDIR)/.emacs.d/scripts/pyimpsort.py
-	$(INSTALL) -m 0755 emacs/scripts/yaml-xref $(DESTDIR)/.emacs.d/scripts/yaml-xref
-	rm -f $(DESTDIR)/.emacs.d/site-lisp/git-grep.el* \
-		$(DESTDIR)/.emacs.d/site-lisp/google-c-style.el*
-
-install-emacs: install-xresources install-emacs-configs
-	$(EMACS) --batch --script emacs/setup.el $(DESTDIR)/.emacs.d
+install-emacs: install-xresources
+	$(MAKE) -C emacs install-emacs
 
 install-emacs-norefresh: export EMACS_PACKAGES_REFRESH_SKIP=1
 install-emacs-norefresh: install-emacs
 
-test-emacs:
-	cd emacs/site-lisp && $(EMACS) -batch -f package-initialize -L . -f buttercup-run-discover
-
 install-vim:
 	$(INSTALL) -m 0644 vim/vimrc $(DESTDIR)/.vimrc
 
diff --git a/emacs/Makefile b/emacs/Makefile
new file mode 100644
index 0000000..77855f8
--- /dev/null
+++ b/emacs/Makefile
@@ -0,0 +1,54 @@
+include ../Makefile.common
+
+EMACS          = emacs
+
+DEST_EMACSDIR  = $(DESTDIR)/.emacs.d
+DEST_SITE_LISP = $(DEST_EMACSDIR)/site-lisp
+DEST_SCRIPTS   = $(DEST_EMACSDIR)/.emacs.d/scripts
+
+EL_FILES =					\
+	init.el					\
+	early-init.el
+
+SITE_LISP_FILES =				\
+	site-lisp/frame-cmds.el			\
+	site-lisp/frame-fns.el			\
+	site-lisp/manual-indent.el		\
+	site-lisp/mc-move.el			\
+	site-lisp/my.el				\
+	site-lisp/tools.el			\
+	site-lisp/vitja-ivy.el			\
+	site-lisp/yaml-xref.el			\
+	site-lisp/zoom-frm.el
+
+SCRIPT_FILES =					\
+	scripts/pyimpsort.py			\
+	scripts/yaml-xref
+
+install-emacs: install-emacs-configs
+	$(EMACS) --batch --script setup.el $(DEST_EMACSDIR)
+
+install-emacs-norefresh: export EMACS_PACKAGES_REFRESH_SKIP=1
+install-emacs-norefresh: install-emacs
+
+install-emacs-configs: install-emacs-el install-site-lisp install-scripts
+	# Remove obsolete configs and direcrories
+	rm -f  $(DESTDIR)/.emacs
+	rm -f $(DEST_SITE_LISP)/git-grep.el* \
+		$(DEST_SITE_LISP)/google-c-style.el*
+
+install-emacs-el:
+	$(INSTALL) -d $(DEST_EMACSDIR)
+	$(INSTALL) -m 0644 $(EL_FILES) $(DEST_EMACSDIR)
+
+install-site-lisp:
+	$(INSTALL) -d $(DEST_SITE_LISP)
+	$(INSTALL) -m 0644 $(SITE_LISP_FILES) $(DEST_SITE_LISP)
+
+install-scripts:
+	$(INSTALL) -d $(DEST_SCRIPTS)
+	$(INSTALL) -m 0755 $(SCRIPT_FILES) $(DEST_SCRIPTS)
+
+test-emacs:
+	cd site-lisp && $(EMACS) -batch -f package-initialize -L . -f buttercup-run-discover
+