diff --git a/emacs/makefile b/emacs/makefile
index 6b8e649..b8bdc2f 100644
--- a/emacs/makefile
+++ b/emacs/makefile
@@ -5,6 +5,8 @@ EMACSD     := ~/.emacs.d
 # Doom Config
 DOOMD      := ~/.doom.d
 DOOM_URL   := https://github.com/doomemacs/doomemacs
+YASD       := ~/.doom.d/snippets
+YAS_URL   := https://github.com/doomemacs/snippets
 
 include ../lib/shared.mk
 
@@ -33,6 +35,7 @@ setup:
 		$(report) header "emacs init"
 		$(mk_link) $(SRC_DIR) $(DOOMD)
 		$(MAKE) -C $(SRC_DIR) doom_init
+		$(MAKE) -C $(SRC_DIR) yas_init
 	fi
 
 doom_init:
@@ -45,3 +48,11 @@ doom_init:
 	else
 		$(report) debug "emacsd already exists. Skipping"
 	fi
+
+
+yas_init:
+	if [ ! -e $(YASD) ] ; then
+		git clone $(YAS_URL) $(YASD) ; $(report) "YAS setup"
+	else
+		$(report) debug "YASD already exists. Skipping"
+	fi