diff --git a/.gitmodules b/.gitmodules
index 6a10f346..1d9c7cbc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -73,9 +73,9 @@
 [submodule "bundle/vim-addon-mw-utils"]
 	path = bundle/vim-addon-mw-utils
 	url = https://github.com/MarcWeber/vim-addon-mw-utils.git
-[submodule "bundle/zencoding-vim"]
-	path = bundle/zencoding-vim
-	url = http://github.com/mattn/zencoding-vim.git
+[submodule "bundle/emmet-vim"]
+	path = bundle/emmet-vim/
+	url = http://github.com/mattn/emmet-vim.git
 [submodule "bundle/ack.vim"]
 	path = bundle/ack.vim
 	url = git://github.com/mileszs/ack.vim.git
diff --git a/bundle/zencoding-vim b/bundle/zencoding-vim
deleted file mode 160000
index b45b08f5..00000000
--- a/bundle/zencoding-vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b45b08f5e8f0d4aa2a9798ab0b9e7ab310d96d22