diff --git a/CHANGELOG b/CHANGELOG
index f7a98ea93..3cca25410 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Moved the Japanese man page from man1/jp to man1/ja. jp is a country
+  code while ja is a language code. Reported by Christian Neukirchen.
+
 o [NSE] Added mysql-enum script which enumerates valid mysql server
   usernames [Aleksandar Nikolic]
 
diff --git a/Makefile.in b/Makefile.in
index d1bee1dcf..b82d473b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -64,7 +64,7 @@ USE_NLS = @USE_NLS@
 # A space-separated list of language codes supported (for man page
 # installation). The user can install a subset of these with the LINGUAS
 # environment variable or none of them with --disable-nls.
-ALL_LINGUAS = de es fr hr hu it jp pl pt_BR pt_PT ro ru sk zh
+ALL_LINGUAS = de es fr hr hu it ja pl pt_BR pt_PT ro ru sk zh
 # A space-separated list of language codes requested by the user.
 LINGUAS ?= $(ALL_LINGUAS)
 
diff --git a/docs/man-xlate/nmap-jp.1 b/docs/man-xlate/nmap-ja.1
similarity index 100%
rename from docs/man-xlate/nmap-jp.1
rename to docs/man-xlate/nmap-ja.1
diff --git a/docs/man-xlate/nmap-man-jp.xml b/docs/man-xlate/nmap-man-ja.xml
similarity index 100%
rename from docs/man-xlate/nmap-man-jp.xml
rename to docs/man-xlate/nmap-man-ja.xml