diff --git a/init.el b/init.el
index 566727f..e6e9c5c 100644
--- a/init.el
+++ b/init.el
@@ -336,6 +336,32 @@
   (setq buffer-face-mode-face '(:family "APL385 Unicode" :height 150))
   (buffer-face-mode))
 
+(use-package matlab
+  :config
+  ;; This is a simple script to set the required environment variables
+  ;; before launching Matlab in Emacs. This prevents an issue where
+  ;; all plot windows are blank. See Arch wiki for more details.
+
+  ;; #!/usr/bin/env bash
+  ;; export _JAVA_AWT_WM_NONREPARENTING=1
+  ;; /usr/local/bin/matlab "$@"
+  (setq matlab-shell-command "~/.local/bin/run_matlab.sh")
+  (setq matlab-shell-command-switches '("-nodesktop"))
+  (setq mlint-program "/usr/local/bin/mlint")
+  (setq-default matlab-show-mlint-warnings t)
+  (set-face-attribute 'linemark-stop-face nil
+		      :background 'unspecified
+		      :underline '(:color "red3" :style wave))
+  (set-face-attribute 'linemark-caution-face nil
+		      :background 'unspecified
+		      :underline '(:color "yellow4" :style wave))
+  (set-face-attribute 'linemark-go-face nil
+		      :background 'unspecified
+		      :underline '(:color "green4" :style wave))
+  (set-face-attribute 'linemark-funny-face nil
+		      :background 'unspecified
+		      :underline '(:color "blue3" :style wave)))
+
 (use-package dyalog-mode
   :ensure t
   :hook (dyalog-mode . my-buffer-face-mode-apl)