diff --git a/.gitmodules b/.gitmodules
index 95de570..8c62511 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -67,3 +67,6 @@
 [submodule "pack/local/start/textformat.vim"]
 	path = pack/local/start/textformat.vim
 	url = https://github.com/jozip/textformat.vim.git
+[submodule "pack/local/start/vim-terraform"]
+	path = pack/local/start/vim-terraform
+	url = https://github.com/hashivim/vim-terraform.git
diff --git a/pack/local/start/vim-terraform b/pack/local/start/vim-terraform
new file mode 160000
index 0000000..89c47c6
--- /dev/null
+++ b/pack/local/start/vim-terraform
@@ -0,0 +1 @@
+Subproject commit 89c47c6c68f6260ba34ee0733437d863046fbe95
diff --git a/vimrc b/vimrc
index ff8512f..c3a48b0 100644
--- a/vimrc
+++ b/vimrc
@@ -31,7 +31,7 @@ set smartcase       " But with style
 set errorbells
 " set visualbell
 set showcmd         " Show (partial) command in status line.
-set showmatch       " Show matching brackets.
+" set showmatch       " Show matching brackets.
 set incsearch       " Incremental search
 set autowrite       " Automatically save before commands like :next and :make
 " set statusline=%<%f\ %H%m%r%=%-14.(%l,%c%)\ %P\ Buf.%n
@@ -43,6 +43,8 @@ set mouse=a
 
 " set paste
 " set clipboard+=unnamed
+"
+let g:loaded_matchparen=1
 
 " We use , as leader
 let g:mapleader = ","