diff --git a/Cask b/Cask
index beee25167..d95e91745 100644
--- a/Cask
+++ b/Cask
@@ -78,6 +78,7 @@
 
 ;; Yasnippet --- core/core-yasnippet.el
 (depends-on "yasnippet")
+(depends-on "auto-yasnippet")
 
 ;; Flycheck --- core/core-flycheck.el
 (depends-on "flycheck")
diff --git a/core/core-yasnippet.el b/core/core-yasnippet.el
index 5199c98c9..f9b9e7759 100644
--- a/core/core-yasnippet.el
+++ b/core/core-yasnippet.el
@@ -74,7 +74,13 @@
   (after! yasnippet
     (advice-add 'yas-expand :before 'sp-remove-active-pair-overlay)))
 
-;; TODO: Add auto-yasnippet
+(use-package auto-yasnippet
+  :commands (aya-create aya-expand aya-open-line aya-persist-snippet)
+  :init
+  (map! :i  "<C-tab>" 'aya-expand
+        :nv "<C-tab>" 'aya-create)
+  :config
+  (setq aya-persist-snippets-dir (concat narf-private-dir "auto-snippets/")))
 
 (provide 'core-yasnippet)
 ;;; core-yasnippet.el ends here