diff --git a/.gitmodules b/.gitmodules
index 3276399..818b752 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule ".vim/bundle/vim-argwrap"]
 	path = .vim/bundle/vim-argwrap
 	url = https://github.com/FooSoft/vim-argwrap.git
-[submodule ".vim/bundle/vim-licenses"]
-	path = .vim/bundle/vim-licenses
-	url = https://github.com/antoyo/vim-licenses.git
 [submodule ".vim/bundle/vim-toml"]
 	path = .vim/bundle/vim-toml
 	url = https://github.com/cespare/vim-toml.git
@@ -124,3 +121,6 @@
 [submodule ".vim/bundle/targets.vim"]
 	path = .vim/bundle/targets.vim
 	url = https://github.com/wellle/targets.vim
+[submodule ".vim/bundle/vim-header"]
+	path = .vim/bundle/vim-header
+	url = https://github.com/alpertuna/vim-header.git
diff --git a/.vim/bundle/vim-header b/.vim/bundle/vim-header
new file mode 160000
index 0000000..059f33a
--- /dev/null
+++ b/.vim/bundle/vim-header
@@ -0,0 +1 @@
+Subproject commit 059f33aac406d54a90f13f9451148ceedf7c3617
diff --git a/.vim/bundle/vim-licenses b/.vim/bundle/vim-licenses
deleted file mode 160000
index 9e29fe7..0000000
--- a/.vim/bundle/vim-licenses
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9e29fe798a2536ead16ac8bfd2c042b45ea62d7e
diff --git a/.vim/plugins.vim b/.vim/plugins.vim
index 62e76d1..229e81c 100644
--- a/.vim/plugins.vim
+++ b/.vim/plugins.vim
@@ -42,13 +42,15 @@ autocmd FileType go let b:argwrap_tail_comma = 1
 " vim-go
 let g:go_fmt_command = 'goimports'
 
+" vim-header
+let g:header_auto_add_header = 0
+let g:header_field_author = 'Alex Yatskov'
+let g:header_field_author_email = 'alex@foosoft.net'
+let g:header_field_filename = 0
+
 " vim-interestinwords
 let g:interestingWordsGUIColors = ['#8CCBEA', '#A4E57E', '#FFDB72', '#FF7272', '#FFB3FF', '#9999FF']
 let g:interestingWordsTermColors = ['154', '121', '211', '137', '214', '222']
 
-" vim-licenses
-let g:licenses_authors_name = 'Alex Yatskov <alex@foosoft.net>'
-let g:licenses_copyright_holders_name = g:licenses_authors_name
-
 " vim-rooter
 let g:rooter_silent_chdir = 1