diff --git a/.gitmodules b/.gitmodules
index 1c74b4b..55f13e9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
 	url = https://github.com/vim-jp/autofmt.git
 [submodule "contrib/go-vim"]
 	path = contrib/go-vim
-	url = https://github.com/vim-jp/go-vim.git
+	url = https://github.com/vim-jp/vim-go-extra.git
 [submodule "contrib/lang-ja"]
 	path = contrib/lang-ja
 	url = https://github.com/vim-jp/lang-ja.git
diff --git a/Makefile b/Makefile
index 7b0795e..a8c5c30 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 include VERSION
 
 DISTDIR=dist
-CORE=vim-$(VERSION_VIM)+kaoriya-$(VERSION_KAORIYA)
+CORE=vim-$(VIM_VER)+kaoriya-$(PATCHSET_VER)
 CORE_TARGET=$(DISTDIR)/$(CORE).tar.bz2
-PATCH=vim-kaoriya-patches-$(VERSION_KAORIYA)
+PATCH=vim-kaoriya-patches-$(PATCHSET_VER)
 PATCH_TARGET=$(DISTDIR)/$(PATCH).tar.bz2
 PATCH_TMPDIR=$(PATCH_TARGET:.tar.bz2=)
 
diff --git a/VERSION b/VERSION
index 2d6764e..53759de 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,4 @@
-VERSION_VIM=7.4.1016
-VERSION_KAORIYA=20160101
+VIM_VER		= 7.4.1655
+PATCHSET_VER	= 20160326
+
+# vim:set ts=8 sts=8 sw=8 tw=0 noet ft=make:
diff --git a/build/msvc/11-build-all.bat b/build/msvc/11-build-all.bat
index 6d78034..944c83e 100644
--- a/build/msvc/11-build-all.bat
+++ b/build/msvc/11-build-all.bat
@@ -4,9 +4,6 @@ SET DATE_VER=%date:~-10,4%%date:~-5,2%%date:~-2,2%
 SET CURDIR=%~dp0
 SET VIMDIR=%~dp0..\..\vim
 
-SET SNAPZIP_W32=vim74-kaoriya-win32-snapshot-%DATE_VER%.zip
-SET SNAPZIP_W64=vim74-kaoriya-win64-snapshot-%DATE_VER%.zip
-
 REM Apply all patches.
 CD "%VIMDIR%"
 git checkout guilt/master
@@ -19,21 +16,10 @@ RD /S /Q "target\vim74-kaoriya-win64"
 DEL /F "target\vim74-kaoriya-win32-%DATE_VER%.zip"
 DEL /F "target\vim74-kaoriya-win64-%DATE_VER%.zip"
 
-REM Clear previous snapshots.
-RD /S /Q "target\vim74-kaoriya-win32-snapshot"
-RD /S /Q "target\vim74-kaoriya-win64-snapshot"
-DEL /F "target\vim74-kaoriya-win32-snapshot-*.zip"
-DEL /F "target\vim74-kaoriya-win64-snapshot-*.zip"
-
-REM Build releases and snapshots.
-CMD /C "tools\msvc-nmake.bat" x86 build-release-pre snapshot-pre
+REM Build releases.
+CMD /C "tools\msvc-nmake.bat" x86 build-release-pre
 IF %ERRORLEVEL% NEQ 0 GOTO :FAILURE
-CMD /C "tools\msvc-nmake.bat" amd64 build-release-pre snapshot-pre
-IF %ERRORLEVEL% NEQ 0 GOTO :FAILURE
-
-REM Update snapshot information.
-DEL /F "target\latest.json"
-go run genjson.go "target\latest.json" "target\%SNAPZIP_W32%" "vim74w32" "http://files.kaoriya.net/vim/snapshots/%SNAPZIP_W32%" "target\%SNAPZIP_W64%" "vim74w64" "http://files.kaoriya.net/vim/snapshots/%SNAPZIP_W64%"
+CMD /C "tools\msvc-nmake.bat" amd64 build-release-pre
 IF %ERRORLEVEL% NEQ 0 GOTO :FAILURE
 
 REM Build release archives.
@@ -42,7 +28,7 @@ START CMD /C "tools\msvc-nmake.bat" amd64 build-release-core
 
 REM Revert all patches.
 CD "%VIMDIR%"
-git checkout master
+REM git checkout master
 CD "%CURDIR%"
 
 :SUCCESS
diff --git a/build/msvc/12-upload-all.bat b/build/msvc/12-upload-all.bat
index 6d0cbea..3dd5d5d 100644
--- a/build/msvc/12-upload-all.bat
+++ b/build/msvc/12-upload-all.bat
@@ -4,12 +4,9 @@ SET DATE_VER=%date:~-10,4%%date:~-5,2%%date:~-2,2%
 
 SET RELZIP_W32=vim74-kaoriya-win32-%DATE_VER%.zip
 SET RELZIP_W64=vim74-kaoriya-win64-%DATE_VER%.zip
-SET SNAPZIP_W32=vim74-kaoriya-win32-snapshot-%DATE_VER%.zip
-SET SNAPZIP_W64=vim74-kaoriya-win64-snapshot-%DATE_VER%.zip
 
 REM Uplaod release files to server.
 
 ECHO Uploading...
 rsync -v target/%RELZIP_W32% target/%RELZIP_W64% "koron@files.kaoriya.net:htdocs/files.kaoriya.net/vim"
-rsync -v target/%SNAPZIP_W32% target/%SNAPZIP_W64% target/latest.json "koron@files.kaoriya.net:htdocs/files.kaoriya.net/vim/snapshots"
 PAUSE
diff --git a/build/msvc/Makefile b/build/msvc/Makefile
index 480e158..acdfad7 100644
--- a/build/msvc/Makefile
+++ b/build/msvc/Makefile
@@ -23,6 +23,7 @@ GETTEXT_DIR	= $(CONTRIB_DIR)\gettext
 VIMPROC_DIR	= $(CONTRIB_DIR)\vimproc
 VIMPROC_DLL	= vimproc_$(WINDOWS_CPUTYPE).dll
 LUAJIT_DIR	= $(CONTRIB_DIR)\luajit-2.0
+LANGJA_DIR	= $(CONTRIB_DIR)\lang-ja
 VIM_DIR		= ..\..\vim
 VIM_INSTALL_DIR	= $(INSTALL_DIR)\share\vim\runtime
 VIM_PATCH_DIR	= $(INSTALL_DIR)\share\vim\patch
@@ -49,7 +50,7 @@ WINDOWS_CPUTYPE=win32
 !IF "$(_NMAKE_VER)" >= "9." && "$(_NMAKE_VER)" < "@."
 MSVC_VERSION=msvc9
 MSVCRT_SUBDIR=Microsoft.VC90.CRT
-MSVCRT_FILES=msvcr90.dll Microsoft.VC90.CRT.manifest
+MSVCRT_FILES=msvcr90.dll
 !ELSEIF "$(_NMAKE_VER)" >= "10." && "$(_NMAKE_VER)" < "11."
 MSVC_VERSION=msvc10
 MSVCRT_SUBDIR=Microsoft.VC100.CRT
@@ -81,6 +82,7 @@ archive-pre:
 	$(MAKE) "$(INSTALL_DIR)\bin\lua51.dll"
 	$(MAKE) vim-clean gvim-clean vim-install
 	$(MAKE) vim-mo-install vim-patch-install
+	$(MAKE) langja-install
 
 contrib: $(INSTALL_DIR)\bin\iconv.dll $(INSTALL_DIR)\bin\intl.dll \
 	$(INSTALL_DIR)\lib\libXpm.lib \
@@ -217,6 +219,28 @@ luajit-clean:
 
 luajit-distclean: luajit-clean
 
+### lang-ja
+
+langja-install:
+	IF NOT EXIST "$(VIM_INSTALL_DIR)" MD "$(VIM_INSTALL_DIR)"
+	IF NOT EXIST "$(VIM_INSTALL_DIR)\lang\ja\LC_MESSAGES" \
+		MD "$(VIM_INSTALL_DIR)\lang\ja\LC_MESSAGES"
+	IF NOT EXIST "$(VIM_INSTALL_DIR)\lang\ja.euc-jp\LC_MESSAGES" \
+		MD "$(VIM_INSTALL_DIR)\lang\ja.euc-jp\LC_MESSAGES"
+	IF NOT EXIST "$(VIM_INSTALL_DIR)\lang\ja.sjis\LC_MESSAGES" \
+		MD "$(VIM_INSTALL_DIR)\lang\ja.sjis\LC_MESSAGES"
+	IF NOT EXIST "$(VIM_INSTALL_DIR)\doc" MD "$(VIM_INSTALL_DIR)\doc"
+	IF NOT EXIST "$(VIM_INSTALL_DIR)\tutor" MD "$(VIM_INSTALL_DIR)\tutor"
+	cd "$(LANGJA_DIR)"
+	make test
+	-COPY src\po\ja.mo "$(VIM_INSTALL_DIR)\lang\ja\LC_MESSAGES\vim.mo" 
+	-COPY src\po\ja.euc-jp.mo "$(VIM_INSTALL_DIR)\lang\ja.euc-jp\LC_MESSAGES\vim.mo" 
+	-COPY src\po\ja.sjis.mo "$(VIM_INSTALL_DIR)\lang\ja.sjis\LC_MESSAGES\vim.mo" 
+	-$(COPY) "runtime\lang" "$(VIM_INSTALL_DIR)\lang" menu_ja*.vim
+	-$(COPY) "runtime\doc" "$(VIM_INSTALL_DIR)\doc" *.UTF-8.1
+	-$(COPY) "runtime\tutor" "$(VIM_INSTALL_DIR)\tutor" tutor.ja.*
+	cd "$(BUILD_DIR)"
+
 ### VIM
 
 vim-build:
@@ -358,6 +382,7 @@ build-release-pre:
 	$(MAKE) "$(INSTALL_DIR)\bin\lua51.dll"
 	$(MAKE) vim-clean gvim-clean vim-install
 	$(MAKE) vim-mo-install vim-patch-install
+	$(MAKE) langja-install
 	$(MAKE) build-dist
 
 build-release-core:
@@ -388,6 +413,7 @@ snapshot-archive:
 	xpm-build xpm-install xpm-clean xpm-distclean \
 	vimproc-build vimproc-install vimproc-clean vimproc-distclean \
 	luajit-build luajit-install luajit-clean luajit-distclean \
+	langja-install \
 	vim-build vim-clean vimd-build vimd-clean \
 	gvim-build gvim-clean gvimd-build gvimd-clean \
 	vim-install vim-mo-install vim-patch-install \
diff --git a/build/msvc2/.gitignore b/build/msvc2/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/build/msvc2/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/build/msvc2/Makefile b/build/msvc2/Makefile
new file mode 100644
index 0000000..4cd944b
--- /dev/null
+++ b/build/msvc2/Makefile
@@ -0,0 +1,413 @@
+# vim:set ts=8 sts=8 sw=8 tw=0 noet:
+
+!include ../../VERSION
+
+DIST_CORE	= vim+kaoriya-$(WINDOWS_CPUTYPE)
+DIST_NAME	= $(DIST_CORE)-$(VIM_VER)+$(PATCHSET_VER)
+
+RTDIR_NAME	= vim74
+
+BUILD_DIR	= $(MAKEDIR)
+OUTPUT_DIR	= $(MAKEDIR)\target
+INSTALL_DIR	= $(OUTPUT_DIR)\install-$(CPUTYPE)
+CONTRIB_DIR	= ..\..\contrib
+XPM_DIR		= $(CONTRIB_DIR)\libXpm-win32\src
+ICONV_DIR	= $(CONTRIB_DIR)\libiconv2\msvc10
+GETTEXT_DIR	= $(CONTRIB_DIR)\gettext
+VIMPROC_DIR	= $(CONTRIB_DIR)\vimproc
+VIMPROC_DLL	= vimproc_$(WINDOWS_CPUTYPE).dll
+LUAJIT_DIR	= $(CONTRIB_DIR)\luajit-2.0
+VIM_DIR		= ..\..\vim
+VIM_INSTALL_DIR	= $(INSTALL_DIR)\share\vim\runtime
+VIM_PATCH_DIR	= $(INSTALL_DIR)\share\vim\patch
+VIM_DIST_DIR	= $(OUTPUT_DIR)\$(DIST_NAME)
+KAORIYA_DIR	= ..\..\kaoriya
+SNAPSHOT_DIR	= $(OUTPUT_DIR)\$(DIST_NAME)-snapshot
+
+MSVCRT_DIR	= $(VCINSTALLDIR)\redist\$(MSVCRT_CPUTYPE)\$(MSVCRT_SUBDIR)
+
+COPY		= Robocopy /XO
+
+# Check CPU type.
+!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+CPUTYPE=x64
+MSVCRT_CPUTYPE=x64
+WINDOWS_CPUTYPE=win64
+!ELSE
+CPUTYPE=x32
+MSVCRT_CPUTYPE=x86
+WINDOWS_CPUTYPE=win32
+!ENDIF
+
+# Check MSVC version.
+!IF "$(_NMAKE_VER)" >= "9." && "$(_NMAKE_VER)" < "@."
+MSVC_VERSION=msvc9
+MSVCRT_SUBDIR=Microsoft.VC90.CRT
+MSVCRT_FILES=msvcr90.dll
+!ELSEIF "$(_NMAKE_VER)" >= "10." && "$(_NMAKE_VER)" < "11."
+MSVC_VERSION=msvc10
+MSVCRT_SUBDIR=Microsoft.VC100.CRT
+MSVCRT_FILES=msvcr100.dll
+!ELSEIF "$(_NMAKE_VER)" >= "11." && "$(_NMAKE_VER)" < "12."
+MSVC_VERSION=msvc11
+MSVCRT_SUBDIR=Microsoft.VC110.CRT
+MSVCRT_FILES=msvcr110.dll
+!ELSEIF "$(_NMAKE_VER)" >= "12." && "$(_NMAKE_VER)" < "13."
+MSVC_VERSION=msvc12
+MSVCRT_SUBDIR=Microsoft.VC120.CRT
+MSVCRT_FILES=msvcr120.dll
+!ELSEIF "$(_NMAKE_VER)" >= "14." && "$(_NMAKE_VER)" < "15."
+MSVC_VERSION=msvc14
+MSVCRT_SUBDIR=Microsoft.VC140.CRT
+MSVCRT_FILES=vcruntime140.dll
+!ELSE
+!ERROR Unknown MSVC version: $(_NMAKE_VER)
+!ENDIF
+
+default:
+	@echo DIST_CORE=$(DIST_CORE)
+	@echo DIST_NAME=$(DIST_NAME)
+
+archive:
+	$(MAKE) archive-pre
+	$(MAKE) archive-dist
+
+archive-pre:
+	$(MAKE) "$(INSTALL_DIR)\bin\iconv.dll"
+	$(MAKE) "$(INSTALL_DIR)\bin\intl.dll"
+	$(MAKE) "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)"
+	$(MAKE) "$(INSTALL_DIR)\bin\lua51.dll"
+	$(MAKE) vim-clean gvim-clean vim-install
+	$(MAKE) vim-mo-install vim-patch-install
+
+contrib: $(INSTALL_DIR)\bin\iconv.dll $(INSTALL_DIR)\bin\intl.dll \
+	$(INSTALL_DIR)\lib\libXpm.lib \
+	$(INSTALL_DIR)\bin\$(VIMPROC_DLL) $(INSTALL_DIR)\bin\lua51.dll
+
+build: iconv-build gettext-build xpm-build vimproc-build luajit-build
+
+install: iconv-install gettext-install xpm-install vimproc-install \
+	luajit-install
+
+clean: iconv-clean gettext-clean xpm-clean vimproc-clean luajit-clean
+
+distclean: iconv-distclean gettext-distclean xpm-distclean vimproc-distclean \
+	luajit-distclean
+
+### ICONV
+
+iconv-build:
+	cd "$(ICONV_DIR)"
+	nmake NODEBUG=1
+	cd "$(BUILD_DIR)"
+
+iconv-install: iconv-build
+	-$(COPY) "$(ICONV_DIR)" "$(INSTALL_DIR)\bin" \
+		iconv.dll iconv_no_i18n.exe
+	-$(COPY) "$(ICONV_DIR)" "$(INSTALL_DIR)\include" \
+		iconv.h
+	-$(COPY) "$(ICONV_DIR)" "$(INSTALL_DIR)\lib" \
+		iconv.lib
+
+iconv-clean:
+	cd "$(ICONV_DIR)"
+	nmake clean
+	cd "$(BUILD_DIR)"
+
+iconv-distclean:
+	cd "$(ICONV_DIR)"
+	nmake distclean
+	cd "$(BUILD_DIR)"
+
+### GETTEXT
+
+gettext-build:
+	cd "$(GETTEXT_DIR)"
+	nmake /NOLOGO /F Makefile.msvc DLL=1 \
+		MFLAGS="-MD -D_BIND_TO_CURRENT_VCLIBS_VERSION=1" \
+		PREFIX="$(INSTALL_DIR)"
+	cd "$(BUILD_DIR)"
+
+gettext-install: gettext-build
+	cd "$(GETTEXT_DIR)"
+	nmake /NOLOGO /F Makefile.msvc DLL=1 \
+		MFLAGS="-MD -D_BIND_TO_CURRENT_VCLIBS_VERSION=1" \
+		PREFIX="$(INSTALL_DIR)" install
+	cd "$(BUILD_DIR)"
+
+gettext-clean:
+	cd "$(GETTEXT_DIR)"
+	nmake /NOLOGO /F Makefile.msvc DLL=1 \
+		MFLAGS="-MD -D_BIND_TO_CURRENT_VCLIBS_VERSION=1" \
+		PREFIX="$(INSTALL_DIR)" clean
+	cd "$(BUILD_DIR)"
+
+gettext-distclean:
+	cd "$(GETTEXT_DIR)"
+	nmake /NOLOGO /F Makefile.msvc DLL=1 \
+		MFLAGS="-MD -D_BIND_TO_CURRENT_VCLIBS_VERSION=1" \
+		PREFIX="$(INSTALL_DIR)" distclean
+	cd "$(BUILD_DIR)"
+
+### XPM
+
+xpm-build:
+	cd "$(XPM_DIR)"
+	nmake -f Make_msvc_lib.mak NODEBUG=1
+	cd "$(BUILD_DIR)"
+
+xpm-install: xpm-build
+	-$(COPY) "$(XPM_DIR)\..\include\X11" "$(INSTALL_DIR)\include" \
+		xpm.h
+	-$(COPY) "$(XPM_DIR)" "$(INSTALL_DIR)\include" \
+		simx.h
+	-$(COPY) "$(XPM_DIR)" "$(INSTALL_DIR)\lib" \
+		libXpm.lib
+
+xpm-clean:
+	cd "$(XPM_DIR)"
+	nmake -f Make_msvc_lib.mak clean
+	cd "$(BUILD_DIR)"
+
+xpm-distclean:
+	cd "$(XPM_DIR)"
+	nmake -f Make_msvc_lib.mak clean
+	cd "$(BUILD_DIR)"
+
+### VIMPROC
+
+vimproc-build:
+	cd "$(VIMPROC_DIR)"
+	nmake /F Make_msvc.mak nodebug=1
+	cd "$(BUILD_DIR)"
+
+vimproc-install: vimproc-build
+	-$(COPY) "$(VIMPROC_DIR)\lib" "$(INSTALL_DIR)\bin" \
+		$(VIMPROC_DLL)
+
+vimproc-clean:
+	cd "$(VIMPROC_DIR)"
+	nmake /F Make_msvc.mak clean
+	cd "$(BUILD_DIR)"
+
+vimproc-distclean:
+	cd "$(VIMPROC_DIR)"
+	nmake /F Make_msvc.mak clean
+	cd "$(BUILD_DIR)"
+
+### LuaJIT
+
+luajit-build:
+	cd "$(LUAJIT_DIR)\src"
+	msvcbuild.bat
+	cd "$(BUILD_DIR)"
+
+luajit-install: luajit-build
+	-$(COPY) "$(LUAJIT_DIR)\src" "$(INSTALL_DIR)\include\lua" \
+		lauxlib.h lua.h lua.hpp luaconf.h lualib.h
+	-$(COPY) "$(LUAJIT_DIR)\src" "$(INSTALL_DIR)\bin" \
+		lua51.dll luajit.exe
+	-$(COPY) "$(LUAJIT_DIR)\src" "$(INSTALL_DIR)\lib" \
+		lua51.lib
+	-$(COPY) /E "$(LUAJIT_DIR)\src\jit" "$(INSTALL_DIR)\bin\lua\jit" /XF .gitignore
+
+luajit-clean:
+
+luajit-distclean: luajit-clean
+
+### VIM
+
+vim-build:
+	cd "$(VIM_DIR)\src"
+	nmake /NOLOGO /F $(BUILD_DIR)\vim.mak
+	cd "$(BUILD_DIR)"
+
+vim-clean:
+	cd "$(VIM_DIR)\src"
+	nmake /NOLOGO /F $(BUILD_DIR)\vim.mak clean
+	- if exist vim.lib del vim.lib
+	cd "$(BUILD_DIR)"
+
+vimd-build:
+	cd "$(VIM_DIR)\src"
+	nmake /NOLOGO /F $(BUILD_DIR)\vim.mak DEBUG=yes
+	cd "$(BUILD_DIR)"
+
+vimd-clean:
+	cd "$(VIM_DIR)\src"
+	nmake /NOLOGO /F $(BUILD_DIR)\vim.mak DEBUG=yes clean
+	- if exist vimd.lib del vimd.lib
+	cd "$(BUILD_DIR)"
+
+gvim-build:
+	cd "$(VIM_DIR)\src"
+	nmake /NOLOGO /F $(BUILD_DIR)\vim.mak GUI=yes IME=yes
+	cd "$(BUILD_DIR)"
+
+gvim-clean:
+	cd "$(VIM_DIR)\src"
+	nmake /NOLOGO /F $(BUILD_DIR)\vim.mak GUI=yes IME=yes clean
+	- if exist gvim.lib del gvim.lib
+	cd "$(BUILD_DIR)"
+
+gvimd-build:
+	cd "$(VIM_DIR)\src"
+	nmake /NOLOGO /F $(BUILD_DIR)\vim.mak GUI=yes IME=yes DEBUG=yes
+	cd "$(BUILD_DIR)"
+
+gvimd-clean:
+	cd "$(VIM_DIR)\src"
+	nmake /NOLOGO /F $(BUILD_DIR)\vim.mak GUI=yes IME=yes DEBUG=yes clean
+	- if exist gvimd.lib del gvimd.lib
+	cd "$(BUILD_DIR)"
+
+vim-install: vim-build gvim-build
+	-$(COPY) "$(VIM_DIR)\src" "$(INSTALL_DIR)\bin" \
+		vim.exe gvim.exe vimrun.exe
+	-$(COPY) "$(VIM_DIR)\src\xxd" "$(INSTALL_DIR)\bin" xxd.exe
+
+vim-mo-install:
+	IF NOT EXIST "$(VIM_INSTALL_DIR)" MD "$(VIM_INSTALL_DIR)"
+	cd "$(VIM_DIR)\src\po"
+	nmake -f Make_mvc.mak VIMRUNTIME="$(VIM_INSTALL_DIR)" \
+		GETTEXT_PATH="$(INSTALL_DIR)\bin" install-all
+	cd "$(BUILD_DIR)"
+
+vim-patch-install:
+	IF NOT EXIST "$(VIM_PATCH_DIR)" MD "$(VIM_PATCH_DIR)"
+	cd "$(VIM_DIR)"
+	-DEL /F /Q "$(VIM_PATCH_DIR)\*"
+	-$(COPY) "..\patches\master" "$(VIM_PATCH_DIR)" *.diff series
+	cd "$(BUILD_DIR)"
+
+### DISTRIBUTION
+
+build-dist:
+# Create distribution directories.
+	IF NOT EXIST "$(VIM_DIST_DIR)" MKDIR "$(VIM_DIST_DIR)"
+	IF NOT EXIST "$(VIM_DIST_DIR)\origdoc" MKDIR "$(VIM_DIST_DIR)\origdoc"
+	IF NOT EXIST "$(VIM_DIST_DIR)\patch" MKDIR "$(VIM_DIST_DIR)\patch"
+	IF NOT EXIST "$(VIM_DIST_DIR)\plugins" MKDIR "$(VIM_DIST_DIR)\plugins"
+	IF NOT EXIST "$(VIM_DIST_DIR)\$(RTDIR_NAME)" MKDIR "$(VIM_DIST_DIR)\$(RTDIR_NAME)"
+	IF NOT EXIST "$(VIM_DIST_DIR)\switches" MKDIR "$(VIM_DIST_DIR)\switches"
+# KaoriYa specific files.
+	-$(COPY) /E "$(KAORIYA_DIR)\doc" "$(VIM_DIST_DIR)"
+	-$(COPY) /E "$(KAORIYA_DIR)\vim" "$(VIM_DIST_DIR)"
+# Switches.
+	IF NOT EXIST "$(VIM_DIST_DIR)\switches\enabled" MKDIR "$(VIM_DIST_DIR)\switches\enabled"
+	-DEL /F /Q "$(VIM_DIST_DIR)\switches\enabled\*.vim"
+# Plugin - vimdoc-ja
+	-$(COPY) /E "$(CONTRIB_DIR)\vimdoc-ja" "$(VIM_DIST_DIR)\plugins\vimdoc-ja" /XD .git /XF .git*
+	"$(INSTALL_DIR)\bin\vim.exe" -n -u NONE -U NONE --noplugin \
+		-c "helptags $(VIM_DIST_DIR)\plugins\vimdoc-ja\doc | quit"
+# Plugin - autofmt
+	-$(COPY) /E "$(CONTRIB_DIR)\autofmt" "$(VIM_DIST_DIR)\plugins\autofmt" /XD .git /XF .git*
+	"$(INSTALL_DIR)\bin\vim.exe" -n -u NONE -U NONE --noplugin \
+		-c "helptags $(VIM_DIST_DIR)\plugins\autofmt\doc | quit"
+# Plugin - vimproc
+	-$(COPY) /E "$(CONTRIB_DIR)\vimproc\doc" \
+		"$(VIM_DIST_DIR)\plugins\vimproc\doc"
+	"$(INSTALL_DIR)\bin\vim.exe" -n -u NONE -U NONE --noplugin \
+		-c "helptags $(VIM_DIST_DIR)\plugins\vimproc\doc | quit"
+	-$(COPY) /E "$(CONTRIB_DIR)\vimproc\plugin" \
+		"$(VIM_DIST_DIR)\plugins\vimproc\plugin"
+	-$(COPY) /E "$(CONTRIB_DIR)\vimproc\autoload" \
+		"$(VIM_DIST_DIR)\plugins\vimproc\autoload" \
+		vimproc.vim
+	-$(COPY) "$(INSTALL_DIR)\bin" \
+		"$(VIM_DIST_DIR)\plugins\vimproc\lib" \
+		$(VIMPROC_DLL)
+	-$(COPY) /E "$(CONTRIB_DIR)\vimproc\autoload\vimproc" \
+		"$(VIM_DIST_DIR)\plugins\vimproc\autoload\vimproc"
+# Plugin - golang
+	-$(COPY) /E "$(CONTRIB_DIR)\go-vim" "$(VIM_DIST_DIR)\plugins\golang" /XD .git /XF .git*
+# Vim and other executable and resource files.
+	-$(COPY) "$(VIM_DIR)" "$(VIM_DIST_DIR)\origdoc" README.txt
+	-$(COPY) "$(INSTALL_DIR)\bin" "$(VIM_DIST_DIR)" \
+		vim.exe gvim.exe vimrun.exe xxd.exe iconv.dll intl.dll \
+		luajit.exe lua51.dll
+	-$(COPY) /E "$(VIM_DIR)\runtime" "$(VIM_DIST_DIR)\$(RTDIR_NAME)"
+	-$(COPY) /E "$(VIM_INSTALL_DIR)" "$(VIM_DIST_DIR)\$(RTDIR_NAME)"
+	"$(INSTALL_DIR)\bin\vim.exe" -n -u NONE -U NONE --noplugin \
+		-c "helptags $(VIM_DIST_DIR)\$(RTDIR_NAME)\doc | quit"
+# Copy MSVC runtime files.
+	-$(COPY) "$(MSVCRT_DIR)" "$(VIM_DIST_DIR)" $(MSVCRT_FILES)
+# Copy patch (diff) files.
+	-$(COPY) /E "$(VIM_PATCH_DIR)" "$(VIM_DIST_DIR)\patch"
+# Copy lua related files
+	-$(COPY) /E "$(INSTALL_DIR)\bin\lua" "$(VIM_DIST_DIR)\lua"
+
+archive-dist: build-dist
+	$(MAKE) zip-dist
+
+zip-dist:
+	cd "$(OUTPUT_DIR)"
+	zip -r9q $(DIST_NAME).zip $(DIST_CORE)
+	cd "$(BUILD_DIR)"
+
+clean-dist:
+	-RD /S /Q "$(VIM_DIST_DIR)"
+
+build-release-pre:
+	$(MAKE) "$(INSTALL_DIR)\bin\iconv.dll"
+	$(MAKE) "$(INSTALL_DIR)\bin\intl.dll"
+	$(MAKE) "$(INSTALL_DIR)\lib\libXpm.lib"
+	$(MAKE) "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)"
+	$(MAKE) "$(INSTALL_DIR)\bin\lua51.dll"
+	$(MAKE) vim-clean gvim-clean vim-install
+	$(MAKE) vim-mo-install vim-patch-install
+	$(MAKE) build-dist
+
+build-release-core:
+	$(MAKE) zip-dist
+
+
+snapshot: snapshot-build snapshot-install snapshot-archive
+
+snapshot-pre: snapshot-install snapshot-archive
+
+snapshot-build:
+	$(MAKE) vim-clean vim-build
+	$(MAKE) gvim-clean gvim-build
+
+snapshot-install:
+	IF NOT EXIST "$(SNAPSHOT_DIR)" MD "$(SNAPSHOT_DIR)"
+	-$(COPY) "$(VIM_DIR)\src" "$(SNAPSHOT_DIR)" vim.exe gvim.exe
+
+snapshot-archive:
+	cd "$(OUTPUT_DIR)"
+	zip -r9q $(DIST_NAME)-snapshot.zip $(DIST_CORE)
+	cd "$(BUILD_DIR)"
+
+
+.PHONY:	archive archive-pre contrib build install clean distclean \
+	iconv-build iconv-install iconv-clean iconv-distclean \
+	gettext-build gettext-install gettext-clean gettext-distclean \
+	xpm-build xpm-install xpm-clean xpm-distclean \
+	vimproc-build vimproc-install vimproc-clean vimproc-distclean \
+	luajit-build luajit-install luajit-clean luajit-distclean \
+	vim-build vim-clean vimd-build vimd-clean \
+	gvim-build gvim-clean gvimd-build gvimd-clean \
+	vim-install vim-mo-install vim-patch-install \
+	build-dist archive-dist zip-dist clean-dist \
+	build-release-pre build-release-core \
+	snapshot
+
+"$(INSTALL_DIR)\bin\iconv.dll":
+	$(MAKE) iconv-clean iconv-install iconv-distclean
+
+"$(INSTALL_DIR)\bin\intl.dll":
+	$(MAKE) gettext-clean gettext-install gettext-distclean
+
+"$(INSTALL_DIR)\lib\libXpm.lib":
+	$(MAKE) xpm-clean xpm-install xpm-distclean
+
+"$(INSTALL_DIR)\bin\$(VIMPROC_DLL)":
+	$(MAKE) vimproc-clean vimproc-install vimproc-distclean
+
+"$(INSTALL_DIR)\bin\lua51.dll":
+	$(MAKE) luajit-install
+
+"$(INSTALL_DIR)\bin\vim.exe":
+	$(MAKE) vim-clean gvim-clean vim-install vim-mo-install \
+		vim-clean gvim-clean
diff --git a/build/msvc2/vim.mak b/build/msvc2/vim.mak
new file mode 100644
index 0000000..aa54b2c
--- /dev/null
+++ b/build/msvc2/vim.mak
@@ -0,0 +1,115 @@
+USERNAME=koron.kaoriya
+USERDOMAIN=gmail.com
+
+FEATURES=HUGE
+MBYTE=YES
+USE_MSVCRT=yes
+MIGEMO=yes
+MAP=no
+
+DISABLE_RUBY=1
+
+# DirectWrite experiment (patch-direct_write.diff)
+DIRECTX=yes
+
+# Perl settings
+!if !defined(DISABLE_IF) && !defined(DISABLE_PERL)
+DYNAMIC_PERL=yes
+PERL_VER=522
+!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+PERL = D:\Perl\Perl-5.22.1-64
+!else
+PERL = D:\Perl\Perl-5.22.1-32
+!endif
+!endif
+
+# Python settings
+!if !defined(DISABLE_IF) && !defined(DISABLE_PYTHON)
+DYNAMIC_PYTHON=yes
+PYTHON_VER=27
+DYNAMIC_PYTHON3=yes
+PYTHON3_VER=35
+!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+PYTHON  = D:\Python\Python27
+PYTHON3 = D:\Python\Python35
+!else
+PYTHON  = D:\Python\Python27-x86
+PYTHON3 = D:\Python\Python35-32
+!endif
+!endif
+
+# Lua settings
+!if !defined(DISABLE_IF) && !defined(DISABLE_LUA)
+DYNAMIC_LUA=yes
+LUA_VER=51
+!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+LUA= ..\..\build\msvc\target\install-x64\include\lua
+!else
+LUA= ..\..\build\msvc\target\install-x32\include\lua
+!endif
+!endif
+
+# Rubyの設定.
+!if !defined(DISABLE_IF) && !defined(DISABLE_RUBY)
+RUBY_VER=22
+RUBY_VER_LONG=2.2.0
+DYNAMIC_RUBY=yes
+!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+RUBY = D:\Ruby\ruby-2.2.4-x64-mswin64
+RUBY_PLATFORM=x64-mswin64_100
+RUBY_INSTALL_NAME=x64-msvcrt-ruby220
+!else
+RUBY = D:\Ruby\ruby-2.2.4-i386-mswin32
+RUBY_PLATFORM=i386-mswin32_100
+RUBY_INSTALL_NAME=msvcrt-ruby220
+!endif
+!endif
+
+# XPMの設定
+!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+XPM=..\..\build\msvc\target\install-x64
+!else
+XPM=..\..\build\msvc\target\install-x32
+!endif
+
+# +channel feature for non-GUI
+CHANNEL=yes
+
+!ifndef DEBUG
+DEBUG=no
+!endif
+
+!IF "$(_NMAKE_VER)" >= "9." && "$(_NMAKE_VER)" < "@."
+MSCVER=9.0
+MSVCRT_DLL=msvcr90.dll
+!ELSEIF "$(_NMAKE_VER)" >= "10." && "$(_NMAKE_VER)" < "11."
+MSCVER=10.0
+MSVCRT_DLL=msvcr100.dll
+!ELSEIF "$(_NMAKE_VER)" >= "11." && "$(_NMAKE_VER)" < "12."
+MSCVER=11.0
+MSVCRT_DLL=msvcr110.dll
+!ELSEIF "$(_NMAKE_VER)" >= "12." && "$(_NMAKE_VER)" < "13."
+MSCVER=12.0
+MSVCRT_DLL=msvcr120.dll
+!ELSEIF "$(_NMAKE_VER)" >= "14." && "$(_NMAKE_VER)" < "15."
+MSCVER=14.0
+MSVCRT_FILES=vcruntime140.dll
+!ELSE
+!ERROR Unknown MSVC version: $(_NMAKE_VER)
+!ENDIF
+
+
+!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+DEFINES_ARCH =
+!ELSE
+DEFINES_ARCH = /D_USE_32BIT_TIME_T=1
+!ENDIF
+
+DEFINES= /DMODIFIED_BY=\"$(USERNAME)@$(USERDOMAIN)\" \
+		/DDYNAMIC_MSVCRT_DLL=\"$(MSVCRT_DLL)\" \
+		/DGETTEXT_DLL=\"intl.dll\" \
+		/DGETTEXT_DLL_ALT=\"intl.dll\" \
+		/D_BIND_TO_CURRENT_VCLIBS_VERSION=1 \
+		$(DEFINES_ARCH)
+
+!include Make_mvc.mak
diff --git a/contrib/lang-ja b/contrib/lang-ja
index 3085219..ef1e1f7 160000
--- a/contrib/lang-ja
+++ b/contrib/lang-ja
@@ -1 +1 @@
-Subproject commit 3085219ca07726e7eb729507854d6210726f5e12
+Subproject commit ef1e1f7e771b7a2c7813fffcdd2eebb02c5ecf44
diff --git a/contrib/luajit-2.0 b/contrib/luajit-2.0
index 3e4a196..713e340 160000
--- a/contrib/luajit-2.0
+++ b/contrib/luajit-2.0
@@ -1 +1 @@
-Subproject commit 3e4a196777450f7db11067e93a17655ba3ee0d53
+Subproject commit 713e34054f6206cb9d453a0924ffd7a302166bdd
diff --git a/contrib/vimdoc-ja b/contrib/vimdoc-ja
index 39f235d..5a03c96 160000
--- a/contrib/vimdoc-ja
+++ b/contrib/vimdoc-ja
@@ -1 +1 @@
-Subproject commit 39f235da944141c12f7f1ef4532dfaa0b7d27008
+Subproject commit 5a03c96246ee0a1b2d83dfc74e32bd72b087178d
diff --git a/contrib/vimproc b/contrib/vimproc
index 4eb5ad8..bca9fef 160000
--- a/contrib/vimproc
+++ b/contrib/vimproc
@@ -1 +1 @@
-Subproject commit 4eb5ad813971a2a0cb3db1e1f85d4f68b46a7732
+Subproject commit bca9fef7faf530d0f3db5dfd61bef46384f06efe
diff --git a/kaoriya/doc/CHANGES.txt b/kaoriya/doc/CHANGES.txt
index 2d4dd6d..415b3ed 100644
--- a/kaoriya/doc/CHANGES.txt
+++ b/kaoriya/doc/CHANGES.txt
@@ -1,3 +1,13 @@
+=== 20160326の変更点 ===
+
+  * ベースコードを7.4.1655に更新しました
+  * dicwin.vim の表示バグを修正しました
+  * contrib 更新
+    * lang-ja (2016-03-14 ef1e1f7)
+    * LuaJIT (2016-03-22 713e340)
+    * vimdoc-ja (2016-03-21 5a03c96)
+    * vimproc (2016-03-19 bca9fef)
+
 === 20160305の変更点 ===
 
   * ベースコードを7.4.1490に更新しました
diff --git a/kaoriya/vim/gvimrc b/kaoriya/vim/gvimrc
index 39017a1..48a48ce 100644
--- a/kaoriya/vim/gvimrc
+++ b/kaoriya/vim/gvimrc
@@ -2,9 +2,9 @@ scriptencoding utf-8
 " vim:set ts=8 sts=2 sw=2 tw=0: (縺薙�ｮ陦後↓髢｢縺励※縺ｯ:help modeline繧貞盾辣ｧ)
 "
 " An example for a Japanese version gvimrc file.
-" 譌･譛ｬ隱樒沿縺ｮ繝�繝輔か繝ｫ繝�GUI險ｭ螳壹ヵ繧｡繧､繝ｫ(gvimrc) - Vim7逕ｨ隧ｦ菴�
+" 譌･譛ｬ隱樒沿縺ｮ繝�繝輔か繝ｫ繝�GUI險ｭ螳壹ヵ繧｡繧､繝ｫ(gvimrc) - Vim 7.4
 "
-" Last Change: 07-May-2013.
+" Last Change: 23-Mar-2016.
 " Maintainer:  MURAOKA Taro <koron.kaoriya@gmail.com>
 "
 " 隗｣隱ｬ:
@@ -174,4 +174,4 @@ if has('printer')
   endif
 endif
 
-" Copyright (C) 2009-2013 KaoriYa/MURAOKA Taro
+" Copyright (C) 2009-2016 KaoriYa/MURAOKA Taro
diff --git a/kaoriya/vim/plugins/kaoriya/plugin/dicwin.vim b/kaoriya/vim/plugins/kaoriya/plugin/dicwin.vim
index e591e50..cb4201b 100644
--- a/kaoriya/vim/plugins/kaoriya/plugin/dicwin.vim
+++ b/kaoriya/vim/plugins/kaoriya/plugin/dicwin.vim
@@ -3,7 +3,7 @@
 " dicwin.vim - Dictionary window
 "
 " Maintainer:	MURAOKA Taro <koron.kaoriya@gmail.com>
-" Last Change:	26-Dec-2012.
+" Last Change:	08-Mar-2016.
 " Commands:	<C-k><C-k>  Search word under cursor.
 "		<C-k>/	    Search prompted word.
 "		<C-k>c	    Close dictionary window.
@@ -92,8 +92,8 @@ endfunction
 
 function! s:DicWinLeave()
   setlocal nowrap
-  normal! zt
   2 wincmd _
+  normal! zt
 endfunction
 
 function! s:DicWinUnload()
diff --git a/kaoriya/vim/switches/catalog/disable-go-extra.vim b/kaoriya/vim/switches/catalog/disable-go-extra.vim
new file mode 100644
index 0000000..cb8df7f
--- /dev/null
+++ b/kaoriya/vim/switches/catalog/disable-go-extra.vim
@@ -0,0 +1,4 @@
+scriptencoding utf-8
+" Disable bundled vim-go-extra (was go-vim).
+"
+" 蜷梧｢ｱ縺輔ｌ縺� vim-go-extra (譌ｧ蜷�:go-vim) 繧堤┌蜉ｹ蛹悶＠縺ｾ縺吶��
diff --git a/kaoriya/vim/switches/catalog/disable-vimproc.vim b/kaoriya/vim/switches/catalog/disable-vimproc.vim
index 3c9667b..48c047b 100644
--- a/kaoriya/vim/switches/catalog/disable-vimproc.vim
+++ b/kaoriya/vim/switches/catalog/disable-vimproc.vim
@@ -1,4 +1,4 @@
 scriptencoding utf-8
-" Disable vimproc help files.
+" Disable bundled vimproc.
 "
 " 蜷梧｢ｱ縺輔ｌ縺� vimproc 繧堤┌蜉ｹ蛹悶＠縺ｾ縺吶��
diff --git a/kaoriya/vim/vimrc b/kaoriya/vim/vimrc
index e627d84..b415d14 100644
--- a/kaoriya/vim/vimrc
+++ b/kaoriya/vim/vimrc
@@ -2,9 +2,9 @@ scriptencoding utf-8
 " vim:set ts=8 sts=2 sw=2 tw=0: (縺薙�ｮ陦後↓髢｢縺励※縺ｯ:help modeline繧貞盾辣ｧ)
 "
 " An example for a Japanese version vimrc file.
-" 譌･譛ｬ隱樒沿縺ｮ繝�繝輔か繝ｫ繝郁ｨｭ螳壹ヵ繧｡繧､繝ｫ(vimrc) - Vim7逕ｨ隧ｦ菴�
+" 譌･譛ｬ隱樒沿縺ｮ繝�繝輔か繝ｫ繝郁ｨｭ螳壹ヵ繧｡繧､繝ｫ(vimrc) - Vim 7.4
 "
-" Last Change: 07-May-2013.
+" Last Change: 23-Mar-2016.
 " Maintainer:  MURAOKA Taro <koron.kaoriya@gmail.com>
 "
 " 隗｣隱ｬ:
@@ -239,4 +239,9 @@ if kaoriya#switch#enabled('disable-vimproc')
   let &rtp = join(filter(split(&rtp, ','), 'v:val !~ "[/\\\\]plugins[/\\\\]vimproc$"'), ',')
 endif
 
-" Copyright (C) 2009-2013 KaoriYa/MURAOKA Taro
+" go-extra: 蜷梧｢ｱ縺ｮ vim-go-extra 繧堤┌蜉ｹ蛹悶☆繧�
+if kaoriya#switch#enabled('disable-go-extra')
+  let &rtp = join(filter(split(&rtp, ','), 'v:val !~ "[/\\\\]plugins[/\\\\]golang$"'), ',')
+endif
+
+" Copyright (C) 2009-2016 KaoriYa/MURAOKA Taro
diff --git a/vim b/vim
index 2369c15..1e7885a 160000
--- a/vim
+++ b/vim
@@ -1 +1 @@
-Subproject commit 2369c15407cf9a730a396ebf9709abb280c5ce48
+Subproject commit 1e7885abe8daa793fd9328d0fd6c456214cb467e