diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el
index af1102b..d4d7ce3 100644
--- a/core/siren-core-modules.el
+++ b/core/siren-core-modules.el
@@ -135,6 +135,7 @@
 ;; Languages
 (require 'siren-prog-mode)
 (require 'siren-applescript)
+(require 'siren-caddyfile)
 (require 'siren-coffee)
 (require 'siren-conf)
 (require 'siren-css)
diff --git a/modules/languages/siren-caddyfile.el b/modules/languages/siren-caddyfile.el
new file mode 100644
index 0000000..d5d5cad
--- /dev/null
+++ b/modules/languages/siren-caddyfile.el
@@ -0,0 +1,24 @@
+;;; siren-caddyfile.el --- jimeh's Emacs Siren: caddyfile-mode configuration.
+
+;;; Commentary:
+
+;; Basic configuration for caddyfile-mode.
+
+;;; Code:
+
+(use-package caddyfile-mode
+  :mode
+  ("Caddyfile\\'" . caddyfile-mode)
+  ("caddy\\.conf\\'" . caddyfile-mode)
+  ("\\.caddy\\'" . caddyfile-mode)
+
+  :hook
+  (caddyfile-mode . siren-caddyfile-mode-setup)
+
+  :init
+  (defun siren-caddyfile-mode-setup ()
+    (setq-local tab-width 4
+                indent-tabs-mode nil)))
+
+(provide 'siren-caddyfile)
+;;; siren-caddyfile.el ends here