diff --git a/emacs.el b/emacs.el
index c399a70..3e14aa6 100644
--- a/emacs.el
+++ b/emacs.el
@@ -2007,6 +2007,10 @@ ORIG-FUNC is the target function, and ARGS is the argument when it is called."
 (with-eval-after-load 'yaml-mode
   (defvar yaml-mode-map (make-sparse-keymap))
   (define-key yaml-mode-map (kbd "C-m") 'newline))
+(when (fboundp 'yaml-mode)
+  (add-to-list 'auto-mode-alist
+               '("\\.yaml\\.gotmpl\\'" . yaml-mode)))
+
 
 (with-eval-after-load 'html-mode
   (defvar html-mode-map (make-sparse-keymap))