diff --git a/src/po/Make_all.mak b/src/po/Make_all.mak
index 89cbb15..7a6144e 100644
--- a/src/po/Make_all.mak
+++ b/src/po/Make_all.mak
@@ -180,3 +180,11 @@
 		zh_TW.UTF-8.ck \
 		zh_TW.ck \
 
+PO_VIM_INPUTLIST = \
+	../../runtime/optwin.vim \
+	../../runtime/defaults.vim
+
+PO_VIM_JSLIST = \
+	optwin.js \
+	defaults.js
+
diff --git a/src/po/Make_cyg.mak b/src/po/Make_cyg.mak
index 0fe7f92..2969d1e 100644
--- a/src/po/Make_cyg.mak
+++ b/src/po/Make_cyg.mak
@@ -63,12 +63,6 @@
 	gvim.desktop.in \
 	vim.desktop.in
 
-PO_VIM_INPUTLIST = \
-	../../runtime/optwin.vim
-
-PO_VIM_JSLIST = \
-	optwin.js
-
 first_time: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
 	$(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
 	$(XGETTEXT) --default-domain=$(LANGUAGE) \
diff --git a/src/po/Make_ming.mak b/src/po/Make_ming.mak
index 5e9428f..1912bc5 100644
--- a/src/po/Make_ming.mak
+++ b/src/po/Make_ming.mak
@@ -18,7 +18,7 @@
 endif
 endif
 
-# get LANGUAGES, MOFILES and MOCONVERTED
+# get LANGUAGES, MOFILES, MOCONVERTED and others
 include Make_all.mak
 
 PACKAGE = vim
@@ -76,12 +76,6 @@
 	gvim.desktop.in \
 	vim.desktop.in
 
-PO_VIM_INPUTLIST = \
-	../../runtime/optwin.vim
-
-PO_VIM_JSLIST = \
-	optwin.js
-
 first_time: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
 	$(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
 	$(XGETTEXT) --default-domain=$(LANGUAGE) \
diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak
index 801a436..bdb6dcc 100644
--- a/src/po/Make_mvc.mak
+++ b/src/po/Make_mvc.mak
@@ -10,7 +10,7 @@
 VIMRUNTIME = ..\..\runtime
 !endif
 
-# get LANGUAGES, MOFILES and MOCONVERTED
+# get LANGUAGES, MOFILES, MOCONVERTED and others
 !include Make_all.mak
 
 PACKAGE = vim
@@ -53,21 +53,14 @@
 	gvim.desktop.in \
 	vim.desktop.in
 
-PO_VIM_INPUTLIST = \
-	..\..\runtime\optwin.vim
-
-PO_VIM_JSLIST = \
-	optwin.js
-
-files: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
+files: $(PO_INPUTLIST)
 	$(LS) $(LSFLAGS) $(PO_INPUTLIST) > .\files
-	echo $(PO_VIM_JSLIST)>> .\files
 
 first_time: files
 	$(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
 	set OLD_PO_FILE_INPUT=yes
 	set OLD_PO_FILE_OUTPUT=yes
-	$(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files
+	$(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files $(PO_VIM_JSLIST)
 	$(VIM) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
 	$(RM) *.js
 
@@ -75,7 +68,7 @@
 	$(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
 	set OLD_PO_FILE_INPUT=yes
 	set OLD_PO_FILE_OUTPUT=yes
-	$(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files
+	$(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files $(PO_VIM_JSLIST)
 	$(MV) $(PACKAGE).po $(PACKAGE).pot
 	$(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
 	$(RM) *.js
diff --git a/src/po/Makefile b/src/po/Makefile
index fbe474b..2b17fea 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -3,7 +3,7 @@
 # Include stuff found by configure.
 include ../auto/config.mk
 
-# get LANGUAGES, MOFILES, MOCONVERTED and CHECKFILES
+# get LANGUAGES, MOFILES, MOCONVERTED and others
 include Make_all.mak
 
 # Note: ja.sjis, *.cp1250 and zh_CN.cp936 are only for MS-Windows, they are
@@ -203,14 +203,6 @@
 	gvim.desktop.in \
 	vim.desktop.in
 
-PO_VIM_INPUTLIST = \
-	../../runtime/optwin.vim \
-	../../runtime/defaults.vim
-
-PO_VIM_JSLIST = \
-	optwin.js \
-	defaults.js
-
 $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
 	# Convert the Vim scripts to (what looks like) Javascript
 	$(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
diff --git a/src/version.c b/src/version.c
index c07afca..9ea324f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1574,
+/**/
     1573,
 /**/
     1572,