diff --git a/README.org b/README.org
index 5f5a08a..e390e11 100644
--- a/README.org
+++ b/README.org
@@ -16,7 +16,9 @@
 ** Installation
 
    1. Clone the repo to =~/.emacs.d=:
-      : git clone git://github.com/jimeh/.emacs.d.git ~/.emacs.d
+      #+BEGIN_SRC
+        git clone git://github.com/jimeh/.emacs.d.git ~/.emacs.d
+      #+END_SRC
    2. Launch Emacs and wait a few minutes while it installs all packages.
    3. Enjoy ^_^
 
diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el
index 6527416..be62bed 100644
--- a/core/siren-core-modules.el
+++ b/core/siren-core-modules.el
@@ -117,10 +117,11 @@
 
 ;; Org-mode
 (require 'siren-htmlize)
-(require 'siren-org-mode)
 (require 'siren-ob-mermaid)
+(require 'siren-org-mode)
 (require 'siren-ox-gfm)
 (require 'siren-ox-jira)
+(require 'siren-ox-pandoc)
 
 ;; Tools
 (require 'siren-docker)
diff --git a/modules/languages/siren-markdown.el b/modules/languages/siren-markdown.el
index eef3e89..f8ac9bc 100644
--- a/modules/languages/siren-markdown.el
+++ b/modules/languages/siren-markdown.el
@@ -31,6 +31,12 @@
   :hook
   (markdown-mode . siren-markdown-mode-setup)
 
+  :custom
+  (markdown-command "pandoc -f gfm -t html5")
+
+  :custom-face
+  (markdown-code-face ((t nil)))
+
   :init
   (defun siren-markdown-mode-setup ()
     (setq markdown-asymmetric-header t
@@ -42,13 +48,7 @@
     (prettier-js-mode)
     (flyspell-mode)
     (smartparens-mode +1)
-    (subword-mode))
-
-  :custom-face
-  (markdown-code-face ((t nil)))
-
-  :custom
-  (markdown-command "redcarpet"))
+    (subword-mode)))
 
 (provide 'siren-markdown)
 ;;; siren-markdown.el ends here
diff --git a/modules/org-mode/siren-ox-pandoc.el b/modules/org-mode/siren-ox-pandoc.el
new file mode 100644
index 0000000..342439b
--- /dev/null
+++ b/modules/org-mode/siren-ox-pandoc.el
@@ -0,0 +1,27 @@
+;;; siren-ox-pandoc.el --- jimeh's Emacs Siren: ox-pandoc configuration.
+
+;;; Commentary:
+
+;; Basic configuration for ox-pandoc.
+
+;;; Code:
+
+(require 'siren-org-mode)
+
+(use-package ox-pandoc
+  :defer t
+
+  :hook
+  (org-mode . siren-ox-pandoc-setup)
+
+  :custom
+  (org-pandoc-options-for-gfm '((columns . "80")))
+  (org-pandoc-options-for-markdown '((columns . "80")))
+  (org-pandoc-options-for-org '((columns . "80")))
+
+  :init
+  (defun siren-ox-pandoc-setup ()
+    (require 'ox-pandoc)))
+
+(provide 'siren-ox-pandoc)
+;;; siren-ox-pandoc.el ends here
diff --git a/modules/tools/siren-pandoc.el b/modules/tools/siren-pandoc.el
new file mode 100644
index 0000000..dc533ce
--- /dev/null
+++ b/modules/tools/siren-pandoc.el
@@ -0,0 +1,14 @@
+;;; siren-pandoc.el --- jimeh's Emacs Siren: pandoc-mode configuration.
+
+;;; Commentary:
+
+;; Basic configuration for pandoc-mode.
+
+;;; Code:
+
+(use-package pandoc-mode
+  :hook
+  (markdown-mode . pandoc-mode))
+
+(provide 'siren-pandoc)
+;;; siren-pandoc.el ends here