diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el
index c6cb790..4344654 100644
--- a/core/siren-core-modules.el
+++ b/core/siren-core-modules.el
@@ -192,6 +192,7 @@
 (require 'siren-coffee)
 (require 'siren-conf)
 (require 'siren-css)
+(require 'siren-csv)
 (require 'siren-cucumber)
 (require 'siren-dart)
 (require 'siren-dockerfile)
diff --git a/modules/languages/siren-csv.el b/modules/languages/siren-csv.el
new file mode 100644
index 0000000..a758cf3
--- /dev/null
+++ b/modules/languages/siren-csv.el
@@ -0,0 +1,31 @@
+;;; siren-csv.el --- jimeh's Emacs Siren: csv configuration.
+
+;;; Commentary:
+
+;; Replace M-x with the more powerful csv.
+
+;;; Code:
+
+(use-package csv-mode
+  :hook
+  (csv-mode . siren-csv-mode-setup)
+
+  :general
+  (:keymaps 'csv-mode-map
+            "C-c C-h" 'csv-header-line)
+
+  :custom
+  (csv-align-max-width 50)
+  (csv-align-min-width 1)
+  (csv-align-padding 2)
+  (csv-align-style 'auto)
+  (csv-header-lines 1)
+  (csv-invisibility-default t)
+
+  :preface
+  (defun siren-csv-mode-setup ()
+    (run-hooks 'prog-mode-hook)
+    (csv-guess-set-separator)))
+
+(provide 'siren-csv)
+;;; siren-csv.el ends here