diff --git a/modules/siren-yaml.el b/modules/siren-yaml.el
new file mode 100644
index 0000000..5f62b61
--- /dev/null
+++ b/modules/siren-yaml.el
@@ -0,0 +1,30 @@
+;;; siren-yaml.el --- jimeh's Emacs Siren: yaml-mode configuration.
+
+;;; Commentary:
+
+;; Basic configuration for yaml-mode.
+
+;;; Code:
+
+(siren-require-package 'yaml-mode)
+
+(require 'siren-programming)
+
+(defun siren-yaml-mode-defaults ()
+  (siren-prog-mode-defaults)
+
+  (subword-mode +1)
+  (setq tab-width 2)
+  (highlight-indentation-set-offset 2)
+  (highlight-indentation-mode)
+  (highlight-indentation-current-column-mode)
+  (setq whitespace-action (quote (auto-cleanup)))
+  (define-key yaml-mode-map (kbd "RET") 'newline-and-indent))
+
+(setq siren-yaml-mode-hook 'siren-yaml-mode-defaults)
+
+(add-hook 'yaml-mode-hook (lambda ()
+                          (run-hooks 'siren-yaml-mode-hook)))
+
+(provide 'siren-yaml)
+;;; siren-yaml.el ends here
diff --git a/siren-modules.el b/siren-modules.el
index f1b7367..2a3ef8e 100644
--- a/siren-modules.el
+++ b/siren-modules.el
@@ -60,6 +60,7 @@
 (require 'siren-scss)
 (require 'siren-sh)
 (require 'siren-thrift)
+(require 'siren-yaml)
 
 (provide 'siren-modules)
 ;;; siren-modules.el ends here