diff --git a/emacs/.emacs.d/config/init-mermaid.el b/emacs/.emacs.d/config/init-mermaid.el
new file mode 100644
index 0000000..e7b5527
--- /dev/null
+++ b/emacs/.emacs.d/config/init-mermaid.el
@@ -0,0 +1,5 @@
+;; -*- lexical-binding: t; -*-
+
+(use-package mermaid-mode)
+
+(provide 'init-mermaid)
diff --git a/emacs/.emacs.d/config/init-plantuml.el b/emacs/.emacs.d/config/init-plantuml.el
index a9414b3..0dd5800 100644
--- a/emacs/.emacs.d/config/init-plantuml.el
+++ b/emacs/.emacs.d/config/init-plantuml.el
@@ -4,7 +4,7 @@
          ("\\.plantuml\\'" .  plantuml-mode)
          ("\\.puml\\'" . plantuml-mode))
   :custom
-  (plantuml-default-exec-mode 'jar)
-  (plantuml-jar-path (expand-file-name "~/plantuml/plantuml.jar")))
+  (plantuml-default-exec-mode 'executable)
+  (plantuml-executable-path (executable-find "plantuml")))
 
 (provide 'init-plantuml)
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 641e547..5e5e007 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -120,6 +120,7 @@
 (require 'init-1pass)
 (require 'init-wallabag)
 (require 'init-plantuml)
+(require 'init-mermaid)
 (require 'handwriting)
 (when (string-equal system-type "darwin")
   (require 'init-mac))