diff --git a/Resources/GNUmakefile b/Resources/GNUmakefile
index 61ce3ace8..39964ad74 100644
--- a/Resources/GNUmakefile
+++ b/Resources/GNUmakefile
@@ -55,7 +55,7 @@ base-resources_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Libraries/gnustep-base/Versions/
 endif
 
 base-resources_LANGUAGES = English German French Italian TraditionalChinese \
-Spanish Esperanto Korean
+Spanish Esperanto Korean Japanese
 base-resources_LOCALIZED_RESOURCE_FILES = Localizable.strings
 base-resources_RESOURCE_DIRS = Languages GSTLS
 base-resources_RESOURCE_FILES = \
@@ -75,7 +75,8 @@ Languages/TraditionalChinese \
 Languages/Slovak \
 Languages/Ukrainian \
 Languages/Esperanto \
-Languages/Korean 
+Languages/Korean \
+Languages/Japanese
 LANGUAGE_INSTALL_FILES = $(LANGUAGE_FILES) Languages/Locale.aliases \
 	Languages/Locale.encodings Languages/Locale.canonical
 
diff --git a/Resources/Japanese.lproj/Localizable.strings b/Resources/Japanese.lproj/Localizable.strings
new file mode 100644
index 000000000..eada660a5
--- /dev/null
+++ b/Resources/Japanese.lproj/Localizable.strings
@@ -0,0 +1,34 @@
+/* Japanese  string encodings */
+GSUndefinedEncoding = 			"Unknown";
+NSProprietaryStringEncoding = 		"Installation-specific";
+NSASCIIStringEncoding = 		"7 bit ASCII";
+NSNonLossyASCIIStringEncoding = 	"Non-lossy ASCII (7 bit)";
+NSMacOSRomanStringEncoding =	 	"MacOS Roman";
+NSNEXTSTEPStringEncoding =		"NEXTSTEP";
+NSSymbolStringEncoding = 		"Adobe Symbol";
+NSWindowsCP1251StringEncoding = 	"Windows \u30ad\u30ea\u30eb\u8a9e (CP1251)";
+NSWindowsCP1252StringEncoding = 	"Windows Latin-1 (CP1252)";
+NSWindowsCP1253StringEncoding = 	"Windows \u30ae\u30ea\u30b7\u30a2\u8a9e (CP1253)";
+NSWindowsCP1254StringEncoding =		"Windows \u30c8\u30eb\u30b3\u8a9e (CP1254)";
+NSWindowsCP1250StringEncoding =		"Windows Latin-2 (CP1250)";
+NSISOLatin1StringEncoding = 		"ISO Latin-1 \u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u8a00\u8a9e (ISO-8859-1)";
+NSISOLatin2StringEncoding = 		"ISO Latin-2 \u4e2d\u592e\u30e8\u30fc\u30ed\u30c3\u30d1\u8a00\u8a9e (ISO-8859-2)"; 
+NSISOLatin3StringEncoding = 		"ISO Latin-3 \u5357\u30e8\u30fc\u30ed\u30c3\u30d1\u8a00\u8a9e (ISO-8859-3)";
+NSISOLatin4StringEncoding = 		"ISO Latin-4 \u5317\u30e8\u30fc\u30ed\u30c3\u30d1\u8a00\u8a9e (ISO-8859-4)";
+NSISOLatin5StringEncoding = 		"ISO Latin-5 \u30c8\u30eb\u30b3\u8a9e (ISO-8859-9)";
+NSISOLatin6StringEncoding = 		"ISO Latin-6 \u5317\u6b27 (ISO-8859-10)";
+NSISOLatin7StringEncoding = 		"ISO Latin-7 \u30d0\u30eb\u30c8\u8a9e (ISO-8859-13)";
+NSISOLatin8StringEncoding = 		"ISO Latin-8 \u30b1\u30eb\u30c8\u8a9e (ISO-8859-14)";
+NSISOLatin9StringEncoding = 		"ISO Latin-9 West European (new) (ISO-8859-15)";
+NSISOCyrillicStringEncoding = 		"\u30ad\u30ea\u30eb\u8a9e (ISO-8859-5)";
+NSISOArabicStringEncoding = 		"\u30a2\u30e9\u30d3\u30a2\u8a9e (ISO-8859-6)";
+NSISOGreekStringEncoding = 		"\u30ae\u30ea\u30b7\u30a2\u8a9e (ISO-8859-7)";
+NSISOHebrewStringEncoding = 		"\u30d8\u30d6\u30e9\u30a4\u8a9e (ISO-8859-8)";
+NSUTF7StringEncoding = 			"Unicode UTF-7 (RFC 2152)";
+NSUTF8StringEncoding = 			"Unicode UTF-8";
+NSUnicodeStringEncoding = 		"Unicode UTF-16";
+NSKOI8RStringEncoding = 		"\u30b1\u30eb\u30c8\u8a9e KOI8-R (\u30ed\u30b7\u30a2\u8a9e)";
+NSJapaneseEUCStringEncoding = 		"\u65e5\u672c\u8a9e EUC";
+NSShiftJISStringEncoding = 		"\u65e5\u672c\u8a9e Shift-JIS";
+NSISO2022JPStringEncoding = 		"\u65e5\u672c\u8a9e JIS (7 bits) (ISO 2022)";
+NSGB2312StringEncoding = 		"\u7c21\u4f53\u4e2d\u56fd\u8a9e GB2312";
diff --git a/Resources/Languages/Japanese b/Resources/Languages/Japanese
new file mode 100644
index 000000000..156ee18fb
--- /dev/null
+++ b/Resources/Languages/Japanese
@@ -0,0 +1,35 @@
+/* Japanese */
+{
+  NSLanguageName = "Japanese";
+  NSLanguageCode = JPN;
+  NSFormalName = "\u65e5\u672c\u8a9e";
+  
+  NSCurrencySymbol = "\u5186";
+  NSPositiveCurrencyFormatString = "9,999.00\u5186";
+  NSNegativeCurrencyFormatString = "-9,999.00\u5186";
+  NSInternationalCurrencyString = "JPY";
+
+  NSDecimalDigits = ("0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
+  NSDecimalSeparator = ".";
+  NSThousandsSeparator = ",";
+
+  NSAMPMDesignation = ("\u5348\u524d", "\u5348\u5f8c");
+  NSDateFormatString = "%Y\u5e74%B%d\u65e5 %A";
+  NSDateTimeOrdering = YMDH;
+  NSEarlierTimeDesignations = (prior, last, past, ago);
+  NSHourNameDesignations = ((0, "\u771f\u591c\u4e2d"), (12, "\u6b63\u5348", "\u663c\u98df"), (10, "\u671d"), (14, "\u5348\u5f8c"), (19, "\u5915\u98df"));
+  NSLaterTimeDesignations = ("\u5148");
+  NSMonthNameArray = ("1\u6708", "2\u6708", "3\u6708", "4\u6708", "5\u6708", "6\u6708", "7\u6708", "8\u6708", "9\u6708", "10\u6708", "11\u6708", "12\u6708");
+  NSNextDayDesignations = ("\u660e\u65e5");
+  NSNextNextDayDesignations = ("\u660e\u5f8c\u65e5");
+  NSPriorDayDesignations = ("\u6628\u65e5");
+  NSShortDateFormatString = "%Y/%m/%d";
+  NSShortMonthNameArray = ("1\u6708", "2\u6708", "3\u6708", "4\u6708", "5\u6708", "6\u6708", "7\u6708", "8\u6708", "9\u6708", "10\u6708", "11\u6708", "12\u6708");
+  NSShortTimeDateFormatString = "%Y %b %d %H:%M";
+  NSShortWeekDayNameArray = ("\u65e5", "\u6708", "\u706b", "\u6c34", "\u6728", "\u91d1", "\u571f"); 
+  NSThisDayDesignations = ("\u4eca\u65e5");
+  NSTimeDateFormatString = "%Y\u5e74%b%d\u65e5(%a) %H:%M:%S %z";
+  NSTimeFormatString = "%H:%M:%S";
+  NSWeekDayNameArray = ("\u65e5\u66dc\u65e5", "\u6708\u66dc\u65e5", "\u706b\u66dc\u65e5", "\u6c34\u66dc\u65e5", "\u6728\u66dc\u65e5", "\u91d1\u66dc\u65e5", "\u571f\u66dc\u65e5");
+  NSYearMonthWeekDesignations = ("\u5e74", "\u6708", "\u9031");
+}