diff --git a/bundles-init/vim-terraform.load.vim b/bundles-init/vim-terraform.load.vim
deleted file mode 100644
index 87ed54c..0000000
--- a/bundles-init/vim-terraform.load.vim
+++ /dev/null
@@ -1 +0,0 @@
-NeoBundle 'hashivim/vim-terraform'
diff --git a/plugins/vim-terraform.cfg.vim b/plugins/vim-terraform.cfg.vim
new file mode 100644
index 0000000..eed9aa1
--- /dev/null
+++ b/plugins/vim-terraform.cfg.vim
@@ -0,0 +1,2 @@
+" Format Terraform files automatically
+let g:terraform_fmt_on_save = 1
diff --git a/plugins/vim-terraform.load.vim b/plugins/vim-terraform.load.vim
new file mode 100644
index 0000000..a2a124f
--- /dev/null
+++ b/plugins/vim-terraform.load.vim
@@ -0,0 +1,6 @@
+call dein#add('hashivim/vim-terraform', #{
+	\	lazy: 1,
+	\	merge_ftdetect: v:true,
+	\	on_ft: ['hcl', 'terraform'],
+	\	on_cmd: ['Terraform', 'TerraformFmt']
+	\ })