diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index b4444c6..b536bc4 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -92,6 +92,10 @@ vim.g.dispatch_no_maps            = 1
 -- vim-fugitive GBrowse GitLab
 vim.g.fugitive_gitlab_domains     = {'https://gitlab.freedesktop.org', 'https://gitlab.gnome.org/GNOME', 'https://gitlab.com'}
 
+-- vim-matchup
+vim.g.matchup_matchparen_offscreen = {}
+vim.g.matchup_surround_enabled     = 1
+
 -- We do this to prevent the loading of the system fzf.vim plugin. This is
 -- present at least on Arch/Manjaro
 vim.api.nvim_command('set rtp-=/usr/share/vim/vimfiles')
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 5768193..5b7169a 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -130,6 +130,7 @@ local init = function ()
   use {
     'chentau/marks.nvim',
   }
+  use 'andymass/vim-matchup'
 end
 
 return require('packer').startup(init)
diff --git a/nvim/.config/nvim/lua/treesitter.lua b/nvim/.config/nvim/lua/treesitter.lua
index 1beb230..c51eb7e 100644
--- a/nvim/.config/nvim/lua/treesitter.lua
+++ b/nvim/.config/nvim/lua/treesitter.lua
@@ -95,5 +95,8 @@ require'nvim-treesitter.configs'.setup {
       goto_node                 = '<CR>',
       show_help                 = '?',
     },
-  }
+  },
+  matchup = {
+    enable = true,
+  },
 }