diff --git a/VERSION b/VERSION
index da036b0..31a6b8c 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,6 @@
-VIM_VER		= 7.4.2358
-PATCHSET_VER	= 20160910
+VIM_VER		= 8.0.0003
+PATCHSET_VER	= 20160913
+
+VIM_VER_SHORT	= 80
 
 # 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 944c83e..a51e08c 100644
--- a/build/msvc/11-build-all.bat
+++ b/build/msvc/11-build-all.bat
@@ -1,6 +1,9 @@
 @ECHO OFF
 
-SET DATE_VER=%date:~-10,4%%date:~-5,2%%date:~-2,2%
+FOR /F "usebackq tokens=1,2 delims==	 " %%i IN ("..\..\VERSION") do SET %%i=%%j
+SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
+SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
+
 SET CURDIR=%~dp0
 SET VIMDIR=%~dp0..\..\vim
 
@@ -11,10 +14,10 @@ IF %ERRORLEVEL% NEQ 0 GOTO :FAILURE
 CD "%CURDIR%"
 
 REM Clear previous releases.
-RD /S /Q "target\vim74-kaoriya-win32"
-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"
+RD /S /Q "target\vim%VIM_VER_SHORT%-kaoriya-win32"
+RD /S /Q "target\vim%VIM_VER_SHORT%-kaoriya-win64"
+DEL /F "target\%RELZIP_W32%"
+DEL /F "target\%RELZIP_W64%"
 
 REM Build releases.
 CMD /C "tools\msvc-nmake.bat" x86 build-release-pre
diff --git a/build/msvc/12-upload-all.bat b/build/msvc/12-upload-all.bat
index 744b8b3..f09ea84 100644
--- a/build/msvc/12-upload-all.bat
+++ b/build/msvc/12-upload-all.bat
@@ -1,9 +1,8 @@
 @ECHO OFF
 
 FOR /F "usebackq tokens=1,2 delims==	 " %%i IN ("..\..\VERSION") do SET %%i=%%j
-
-SET RELZIP_W32=vim74-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
-SET RELZIP_W64=vim74-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
+SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
+SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
 
 REM Uplaod release files to server.
 
diff --git a/build/msvc/13-update-canary.bat b/build/msvc/13-update-canary.bat
index f1f7366..c35585f 100644
--- a/build/msvc/13-update-canary.bat
+++ b/build/msvc/13-update-canary.bat
@@ -4,10 +4,10 @@ FOR /F "usebackq tokens=1,2 delims==	 " %%i IN ("..\..\VERSION") do SET %%i=%%j
 
 SET REMOTE_HOST=koron@files.kaoriya.net
 SET REMOTE_WORKDIR=/home/htdocs/files.kaoriya.net/vim/
-SET RELZIP_W32=vim74-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
-SET RELZIP_W64=vim74-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
-SET ABSZIP_W32=vim74-kaoriya-win32-test.zip
-SET ABSZIP_W64=vim74-kaoriya-win64-test.zip
+SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
+SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
+SET ABSZIP_W32=vim-kaoriya-win32-canary.zip
+SET ABSZIP_W64=vim-kaoriya-win64-canary.zip
 
 ssh "%REMOTE_HOST%" "cd %REMOTE_WORKDIR%; ln -fv %RELZIP_W32% %ABSZIP_W32%; ln -fv %RELZIP_W64% %ABSZIP_W64%"
 
diff --git a/build/msvc/14-update-develop.bat b/build/msvc/14-update-develop.bat
index 4f751a9..c01b42f 100644
--- a/build/msvc/14-update-develop.bat
+++ b/build/msvc/14-update-develop.bat
@@ -4,10 +4,10 @@ FOR /F "usebackq tokens=1,2 delims==	 " %%i IN ("..\..\VERSION") do SET %%i=%%j
 
 SET REMOTE_HOST=koron@files.kaoriya.net
 SET REMOTE_WORKDIR=/home/htdocs/files.kaoriya.net/vim/
-SET RELZIP_W32=vim74-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
-SET RELZIP_W64=vim74-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
-SET ABSZIP_W32=vim74-kaoriya-win32.zip
-SET ABSZIP_W64=vim74-kaoriya-win64.zip
+SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
+SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
+SET ABSZIP_W32=vim-kaoriya-win32-develop.zip
+SET ABSZIP_W64=vim-kaoriya-win64-develop.zip
 
 ssh "%REMOTE_HOST%" "cd %REMOTE_WORKDIR%; ln -fv %RELZIP_W32% %ABSZIP_W32%; ln -fv %RELZIP_W64% %ABSZIP_W64%"
 
diff --git a/build/msvc/Makefile b/build/msvc/Makefile
index b31968a..1658945 100644
--- a/build/msvc/Makefile
+++ b/build/msvc/Makefile
@@ -8,12 +8,12 @@
 #     DISABLE_LUA=1	Disalbe Lua interfaces
 #     DISABLE_RUBY=1	Disalbe Ruby interfaces
 
-DIST_VER	= 74-kaoriya-$(WINDOWS_CPUTYPE)
-DATE_VER	= %%date:~-10,4%%%%date:~-5,2%%%%date:~-2,2%%
-
 !include ..\..\VERSION
 
-RTDIR_NAME	= vim74
+DIST_VER	= $(VIM_VER_SHORT)-kaoriya-$(WINDOWS_CPUTYPE)
+DATE_VER	= %%date:~-10,4%%%%date:~-5,2%%%%date:~-2,2%%
+
+RTDIR_NAME	= vim$(VIM_VER_SHORT)
 
 BUILD_DIR	= $(MAKEDIR)
 OUTPUT_DIR	= $(MAKEDIR)\target
@@ -387,7 +387,7 @@ archive-dist: build-dist
 
 zip-dist:
 	cd "$(OUTPUT_DIR)"
-	zip -r9q vim$(DIST_VER)-$(VIM_VER)-$(DATE_VER).zip vim$(DIST_VER)
+	zip -r9q vim$(DIST_VER)-$(VIM_VER)-$(PATCHSET_VER).zip vim$(DIST_VER)
 	cd "$(BUILD_DIR)"
 
 clean-dist:
@@ -422,7 +422,7 @@ snapshot-install:
 
 snapshot-archive:
 	cd "$(OUTPUT_DIR)"
-	zip -r9q vim$(DIST_VER)-snapshot-$(DATE_VER).zip vim$(DIST_VER)-snapshot
+	zip -r9q vim$(DIST_VER)-snapshot-$(PATCHSET_VER).zip vim$(DIST_VER)-snapshot
 	cd "$(BUILD_DIR)"
 
 
diff --git a/build/msvc/vim.mak b/build/msvc/vim.mak
index d91f0b6..8d51fa7 100644
--- a/build/msvc/vim.mak
+++ b/build/msvc/vim.mak
@@ -50,7 +50,7 @@ LUA= ..\..\build\msvc\target\install-x32\include\lua
 # Rubyの設定.
 !if !defined(DISABLE_IF) && !defined(DISABLE_RUBY)
 RUBY_VER=23
-RUBY_VER_LONG=2.3.0
+RUBY_API_VER_LONG=2.3.0
 DYNAMIC_RUBY=yes
 !if "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
 RUBY = D:\Ruby\ruby-2.3.1-x64-mswin64
diff --git a/contrib/lang-ja b/contrib/lang-ja
index b5fef4b..57db842 160000
--- a/contrib/lang-ja
+++ b/contrib/lang-ja
@@ -1 +1 @@
-Subproject commit b5fef4be9ec8edec0d9d6dea608e653f2daf14c7
+Subproject commit 57db84234fbd4b24d0e0bd82048c8f7d135ede4f
diff --git a/contrib/vimdoc-ja b/contrib/vimdoc-ja
index 135a75f..da005d9 160000
--- a/contrib/vimdoc-ja
+++ b/contrib/vimdoc-ja
@@ -1 +1 @@
-Subproject commit 135a75fba6e5412bb21d84063c32e2633b35deb5
+Subproject commit da005d90a18b6500163ad9fb4c8118ec31437281
diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md
new file mode 100644
index 0000000..6ded29c
--- /dev/null
+++ b/kaoriya/doc/CHANGES.md
@@ -0,0 +1,9 @@
+## 2016/09/13 縺ｮ螟画峩轤ｹ
+
+*   繝吶�ｼ繧ｹ繧ｳ繝ｼ繝峨ｒ8.0.0003縺ｫ譖ｴ譁ｰ縺励∪縺励◆
+*   contrib 譖ｴ譁ｰ
+    *   lang-ja (2016-09-13 57db842)
+    *   vimdoc-ja (2016-09-12 da005d9)
+*   驕主悉縺ｮ螟画峩轤ｹ(CHANGES.txt)繧堤ｧｻ蜍輔＠縺ｾ縺励◆
+
+    <https://github.com/koron/vim-kaoriya/tree/master/old/CHANGES-7.txt>
diff --git a/kaoriya/doc/README.txt b/kaoriya/doc/README.txt
index 86e15d3..854e289 100644
--- a/kaoriya/doc/README.txt
+++ b/kaoriya/doc/README.txt
@@ -1,9 +1,9 @@
-                   Vim version 7.4 香り屋版 導入マニュアル
+                   Vim version 8.0 香り屋版 導入マニュアル
 
-                                                         Version: 1.8.1
+                                                         Version: 1.9.0
                                                           Author: MURAOKA Taro
                                                            Since: 23-Aug-1999
-                                                     Last Change: 04-Sep-2016.
+                                                     Last Change: 12-Sep-2016.
 
 概要
   Vimはviクローンに分類されるテキストエディタです。
@@ -20,12 +20,12 @@
   いるので、解凍してシステム内の好きな場所に配置してください。
 
   32bit版
-    配布ファイル: vim74-kaoriya-win32-V.V.VVV-YYYYMMDD.zip
-    Vimプログラムフォルダ: vim74-kaoriya-win32.zip
+    配布ファイル: vim80-kaoriya-win32-V.V.VVV-YYYYMMDD.zip
+    Vimプログラムフォルダ: vim80-kaoriya-win32.zip
 
   64bit版
-    配布ファイル: vim74-kaoriya-win64-V.V.V-YYYYMMDD.zip
-    Vimプログラムフォルダ: vim74-kaoriya-win64
+    配布ファイル: vim80-kaoriya-win64-V.V.V-YYYYMMDD.zip
+    Vimプログラムフォルダ: vim80-kaoriya-win64
 
   上記のV.V.VにはベースとなったVimのバージョンがパッチ番号まで含めて入ります。
   上記のYYYYMMDDにはリリースの年月日が入ります。
@@ -217,10 +217,12 @@ Vim
       https://github.com/vim-jp/issues/issues (バグ報告、機能要望)
   - vim_jp Google グループ
       http://groups.google.com/group/vim_jp/?hl=ja
-  - Vimドキュメント翻訳(vimdoc-ja)
+  - 日本語ドキュメント
       https://github.com/vim-jp/vimdoc-ja/
+      https://github.com/vim-jp/vimdoc-ja-working/
+      https://github.com/vim-jp/lang-ja/
   - 香り屋版メンテナ
-      http://www.kaoriya.net/software/vim
+      https://github.com/koron/vim-kaoriya/
       MURAOKA Taro <koron.kaoriya@gmail.com>
       Twitter @kaoriya
 
diff --git a/kaoriya/doc/CHANGES.txt b/old/CHANGES-7.txt
similarity index 100%
rename from kaoriya/doc/CHANGES.txt
rename to old/CHANGES-7.txt
diff --git a/patches b/patches
index 1959b3f..91f2de1 160000
--- a/patches
+++ b/patches
@@ -1 +1 @@
-Subproject commit 1959b3f098a8c927b66c370108a94deaa2253dab
+Subproject commit 91f2de17f125f0fb98892e5621bb2a36e98b5fda
diff --git a/vim b/vim
index d47d837..789a5c0 160000
--- a/vim
+++ b/vim
@@ -1 +1 @@
-Subproject commit d47d83745ff450232328ca7a4b8b00b31bad22fc
+Subproject commit 789a5c0e3d27f09456678f0cfb6c1bd2d8ab4a35