diff --git a/.gitmodules b/.gitmodules
index 2023e06..c26705d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -64,3 +64,6 @@
 [submodule "site-lisp/yasnippet-snippets"]
 	path = site-lisp/yasnippet-snippets
 	url = https://github.com/AndreaCrotti/yasnippet-snippets.git
+[submodule "site-lisp/auto-yasnippet"]
+	path = site-lisp/auto-yasnippet
+	url = https://github.com/abo-abo/auto-yasnippet.git
diff --git a/lisp/init-tools.el b/lisp/init-tools.el
index 770cc42..3bb685d 100644
--- a/lisp/init-tools.el
+++ b/lisp/init-tools.el
@@ -31,4 +31,17 @@
 (add-hook 'prog-mode-hook #'yas-minor-mode)
 
 
+(lazy-load-global-keys
+ '(("w"   . aya-create)
+   ("TAB" . aya-expand)
+   ("SPC" . aya-expand-from-history)
+   ("d"   . aya-delete-from-history)
+   ("c"   . aya-clear-history)
+   ("n"   . aya-next-in-history)
+   ("p"   . aya-previous-in-history)
+   ("s"   . aya-persist-snippet)
+   ("o"   . aya-open-line))
+ "auto-yasnippet" "C-c C-y")
+
+
 (provide 'init-tools)
diff --git a/site-lisp/auto-yasnippet b/site-lisp/auto-yasnippet
new file mode 160000
index 0000000..f54fb42
--- /dev/null
+++ b/site-lisp/auto-yasnippet
@@ -0,0 +1 @@
+Subproject commit f54fb424082a68f28d2b86707d9bd1cd506b2d9a