diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index 2d9b0a742..f43794570 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -1459,6 +1459,7 @@ Other:
   - Added ~SPC m d b~ to toggle IEx.pry breakpoint
 - lsp layer is a dependency when backend is set to 'lsp (thanks to mpanarin)
 - "C-j" indents line properly (thanks to mpanarin)
+- Enabled =evil-matchit= (thanks to Miloš Mošić)
 **** Elm
 - Fixed flycheck initialization (thanks to Kevin W. van Rooijen)
 - Added =elm-test-runner= (thanks to Juan Edi)
diff --git a/layers/+lang/elixir/packages.el b/layers/+lang/elixir/packages.el
index d2fd133fe..003ab7481 100644
--- a/layers/+lang/elixir/packages.el
+++ b/layers/+lang/elixir/packages.el
@@ -16,6 +16,7 @@
         counsel-gtags
         dap-mode
         elixir-mode
+        evil-matchit
         flycheck
         flycheck-credo
         flycheck-mix
@@ -155,6 +156,9 @@
   (add-to-list 'spacemacs--dap-supported-modes 'elixir-mode)
   (add-hook 'elixir-mode-local-vars-hook #'spacemacs//elixir-setup-dap))
 
+(defun elixir/post-init-evil-matchit ()
+  (add-hook 'elixir-mode-hook `turn-on-evil-matchit-mode))
+
 (defun elixir/init-elixir-mode ()
   (use-package elixir-mode
     :defer t