diff --git a/custom.el b/custom.el
index c76af7d..9777930 100644
--- a/custom.el
+++ b/custom.el
@@ -11,7 +11,7 @@
  '(anzu-search-threshold 1000)
  '(package-selected-packages
    (quote
-    (editorconfig whitespace-cleanup-mode rainbow-mode scss-mode sass-mode less-css-mode ac-php smarty-mode php-mode pkgbuild-mode markdown-mode flycheck anzu sml-modeline smart-mode-line-powerline-theme smart-mode-line nlinum sublime-themes))))
+    (yaml-mode editorconfig whitespace-cleanup-mode rainbow-mode scss-mode sass-mode less-css-mode ac-php smarty-mode php-mode pkgbuild-mode markdown-mode flycheck anzu sml-modeline smart-mode-line-powerline-theme smart-mode-line nlinum sublime-themes))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/init.el b/init.el
index 3cf0d87..ca5e9f0 100644
--- a/init.el
+++ b/init.el
@@ -47,6 +47,7 @@
 (require 'init-less)
 (require 'init-sass)
 (require 'init-scss)
+(require 'init-yaml)
 ;; Plus
 (require 'init-rainbow)
 
diff --git a/lisp/init-yaml.el b/lisp/init-yaml.el
new file mode 100644
index 0000000..47956c8
--- /dev/null
+++ b/lisp/init-yaml.el
@@ -0,0 +1,4 @@
+;; yaml-mode
+(require-package 'yaml-mode)
+(add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
+(provide 'init-yaml)