diff --git a/configure.in b/configure.in
index 5cd27217..93d47ef6 100644
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION")
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
-ALL_LINGUAS="de dk en_US es fr hu ko nl no ru sv pt pt_BR tr"
+ALL_LINGUAS="de dk en_US es fr hu ko nl no ru sv pt pt_BR tr ja"
 
 AC_PROG_CC
 AC_PROG_MAKE_SET
diff --git a/debian/Makefile.am b/debian/Makefile.am
index 1e46c023..860d251b 100644
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -21,7 +21,5 @@ enlightenment.menu \
 enlightenment.menu-method \
 enlightenment.postinst \
 enlightenment.prerm \
-files \
 menumangler.pl \
-rules \
-substvars
+rules
diff --git a/po/ja.po b/po/ja.po
index 9a9ff250..67a03a47 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1802,7 +1802,6 @@ msgstr ""
 "¥ª¡¼¥È¥»¡¼¥Ö¥Ç¡¼¥¿¤ò½ñ¤­¹þ¤ß»þÅÀ¤Ç¥¨¥é¡¼¤¬µ¯¤­¤Þ¤·¤¿¡£\n"
 "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ËÌäÂ꤬¤¢¤ê¤Þ¤¹¡£\n"
 
-#. Less of the hope.... E survives
 #: src/session.c:1090
 msgid ""
 "ERROR!\n"
@@ -1948,7 +1947,8 @@ msgstr "
 
 #: src/settings.c:449
 msgid "Focus follows pointer sloppily"
-msgstr "¥Þ¥¦¥¹¤Î¤¢¤ë¥¦¥£¥ó¥É¥¦¤¬¥Õ¥©¡¼¥«¥¹(¥¦¥£¥ó¥É¥¦¤òÎ¥¤ì¤Æ¤â¥Õ¥©¡¼¥«¥¹¤ÏÊÝ»ý)"
+msgstr ""
+"¥Þ¥¦¥¹¤Î¤¢¤ë¥¦¥£¥ó¥É¥¦¤¬¥Õ¥©¡¼¥«¥¹(¥¦¥£¥ó¥É¥¦¤òÎ¥¤ì¤Æ¤â¥Õ¥©¡¼¥«¥¹¤ÏÊÝ»ý)"
 
 #: src/settings.c:457
 msgid "Focus follows mouse clicks"
@@ -1968,7 +1968,9 @@ msgstr "
 
 #: src/settings.c:504
 msgid "Only new dialogs whose owner is focused get the focus"
-msgstr "¿·µ¬¥À¥¤¥¢¥í¥°¤Ï´Ø·¸¤¹¤ë¥¦¥£¥ó¥É¥¦¤¬¥Õ¥©¡¼¥«¥¹¤µ¤ì¤Æ¤¤¤ë¤È¤­¤À¤±¥Õ¥©¡¼¥«¥¹¤µ¤ì¤ë"
+msgstr ""
+"¿·µ¬¥À¥¤¥¢¥í¥°¤Ï´Ø·¸¤¹¤ë¥¦¥£¥ó¥É¥¦¤¬¥Õ¥©¡¼¥«¥¹¤µ¤ì¤Æ¤¤¤ë¤È¤­¤À¤±¥Õ¥©¡¼¥«¥¹¤µ¤"
+"ì¤ë"
 
 #: src/settings.c:512
 msgid "Raise windows on focus switch"
@@ -2528,11 +2530,13 @@ msgstr "
 
 #: src/settings.c:4069
 msgid "Snapshot Windows, Use application icon, Use Enlightenment Icon"
-msgstr "¥¦¥£¥ó¥É¥¦¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥¢¥¤¥³¥ó¡¢Enlightenment ¥¢¥¤¥³¥ó"
+msgstr ""
+"¥¦¥£¥ó¥É¥¦¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥¢¥¤¥³¥ó¡¢Enlightenment ¥¢¥¤¥³¥ó"
 
 #: src/settings.c:4078
 msgid "Use application icon, Use Enlightenment Icon, Snapshot Window"
-msgstr "¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥¢¥¤¥³¥ó¡¢Enlightenment ¥¢¥¤¥³¥ó¡¢¥¦¥£¥ó¥É¥¦¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È"
+msgstr ""
+"¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥¢¥¤¥³¥ó¡¢Enlightenment ¥¢¥¤¥³¥ó¡¢¥¦¥£¥ó¥É¥¦¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È"
 
 #: src/settings.c:4086
 msgid "Use Enlightenment Icon, Snapshot Window"