diff --git a/Doc/Makefile b/Doc/Makefile
index 161f7183597376..162a87647b528d 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -188,5 +188,5 @@ autobuild-stable-html:
 # i18n commands
 .PHONY: gettext
 gettext:
-	sphinx-build -E -b gettext -D gettext_compact=0  -w warnings.txt -d build/.doctrees . locale/pot
-	find locale/pot -name '*.pot' | xargs sed -i -e '/^"POT-Creation-Date: 20/d'
+	$(SPHINXBUILD) -E -b gettext -D gettext_compact=0  -w warnings.txt -d build/.doctrees . locale/pot
+	$(PYTHON) tools/delete_pot_creation_date.py locale/pot
diff --git a/Doc/make.bat b/Doc/make.bat
index d0b59618261011..4f67a4df614caa 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -40,6 +40,9 @@ if "%1" == "clean" (
     goto end
 )
 
+rem JP: i18n target
+if "%1" EQU "gettext" goto gettext
+
 %SPHINXBUILD% >nul 2> nul
 if errorlevel 9009 (
     echo.
@@ -126,5 +129,11 @@ goto end
 cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html
 goto end
 
+:gettext
+cmd /C %SPHINXBUILD% -E -b gettext -D gettext_compact=0  -w warnings.txt -d build\.doctrees . locale\pot
+cmd /C %PYTHON% tools\delete_pot_creation_date.py locale\pot
+
+goto end
+
 :end
 popd
diff --git a/Doc/tools/delete_pot_creation_date.py b/Doc/tools/delete_pot_creation_date.py
new file mode 100644
index 00000000000000..53903b23c183d4
--- /dev/null
+++ b/Doc/tools/delete_pot_creation_date.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+import io
+import os
+import sys
+
+
+def delete_pot_creation_date(filename):
+    with io.open(filename, 'r', encoding='utf-8') as f:
+        lines = f.readlines()
+
+    with io.open(filename, 'w', encoding='utf-8') as f:
+        f.writelines((line for line in lines if not line.startswith('"POT-Creation-Date: 20')))
+
+
+def main(basedir):
+    for dirpath, _, filenames in os.walk(basedir):
+        for filename in filenames:
+            if filename.endswith('.pot'):
+                delete_pot_creation_date(os.path.join(dirpath, filename))
+
+
+if __name__ == '__main__':
+    if len(sys.argv) < 2:
+        print('too few argument')
+        print('Usage: {0} <basedir>'.format(sys.argv[0]))
+        sys.exit(1)
+    sys.exit(main(sys.argv[1]))