diff --git a/.gitmodules b/.gitmodules
index bb9b2bf9d..943baac9a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,7 +26,7 @@
 	path = spacemacs/extensions/powerline
 	url = http://github.com/syl20bnr/powerline
 [submodule "snippets"]
-	path = snippets
+	path = spacemacs/snippets
 	url = http://github.com/syl20bnr/yasnippet-snippets
 [submodule "extensions/use-package"]
 	path = spacemacs/extensions/use-package
diff --git a/spacemacs/init-package/init-yasnippet.el b/spacemacs/init-package/init-yasnippet.el
index a7171c6cd..21abc339a 100644
--- a/spacemacs/init-package/init-yasnippet.el
+++ b/spacemacs/init-package/init-yasnippet.el
@@ -6,7 +6,7 @@
       (use-package yasnippet
         :config
         (progn
-          (setq yas-snippet-dirs '("~/.emacs.d/snippets"))
+          (setq yas-snippet-dirs (list (concat spacemacs-config-directory "snippets")))
           (yas-global-mode 1)
           ))
       )
diff --git a/snippets b/spacemacs/snippets
similarity index 100%
rename from snippets
rename to spacemacs/snippets