diff --git a/desmume/ChangeLog b/desmume/ChangeLog
index a07377135..8d6ed2542 100644
--- a/desmume/ChangeLog
+++ b/desmume/ChangeLog
@@ -5,6 +5,7 @@ General/Core:
  bug: fix dma address reloading
  bug: fix rom close memory corruption
  bug: fix div and sqrt busy flag bug
+ bug: fix vectest
 
 Graphics:
  bug: fix a mistakenly rendered OBJ window
@@ -13,6 +14,7 @@ Windows:
  bug: fix 16bpp display
  bug: more fixes to multi-gamepads
  enh: add EPX and EPX1.5X resize filters
+ enh: add a japanese translation which will soon be stale like the others
  
 0.9.4 -> 0.9.5 (r2437-r3075)
 
diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index 6382230cd..466afbb8a 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -1912,6 +1912,11 @@ void SetLanguage(int langid)
 		setLanguage(MAKELCID(MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN), SORT_DEFAULT));
 		SetThreadLocale(MAKELCID(MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN), SORT_DEFAULT));
 		break;
+	case 5:
+		// Japanese
+		setLanguage(MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT));
+		SetThreadLocale(MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT));
+		break;
 
 	default: break;
 		break;
@@ -1931,7 +1936,7 @@ void SaveLanguage(int langid)
 void CheckLanguage(UINT id)
 {
 	int i;
-	for (i = IDC_LANGENGLISH; i < IDC_LANG_CHINESE_SIMPLIFIED+1; i++)
+	for (i = IDC_LANGENGLISH; i < IDC_LANGJAPANESE+1; i++)
 		MainWindow->checkMenu(i, false);
 
 	MainWindow->checkMenu(id, true);
@@ -4822,6 +4827,11 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
 			ChangeLanguage(1);
 			CheckLanguage(LOWORD(wParam));
 			return 0;
+		case IDC_LANGDANISH:
+			SaveLanguage(2);
+			ChangeLanguage(2);
+			CheckLanguage(LOWORD(wParam));
+			return 0;
 		case IDC_LANG_CHINESE_SIMPLIFIED:
 			SaveLanguage(3);
 			ChangeLanguage(3);
@@ -4832,12 +4842,11 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
 			ChangeLanguage(4);
 			CheckLanguage(LOWORD(wParam));
 			return 0;
-		
-		case IDC_LANGDANISH:
-			SaveLanguage(2);
-			ChangeLanguage(2);
+		case IDC_LANGJAPANESE:
+			SaveLanguage(5);
+			ChangeLanguage(5);
 			CheckLanguage(LOWORD(wParam));
-		return 0;
+			return 0;
 
 		case IDC_FRAMELIMIT:
 			FrameLimit ^= 1;
diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h
index e981c8607..636d47817 100644
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@@ -94,8 +94,11 @@
 #define IDC_LANGENGLISH                 210
 #define IDC_LANGFRENCH                  211
 #define IDC_LANGDANISH                  212
-#define IDM_MGPU                        213
-#define IDM_SGPU                        214
+#define IDC_LANG_CHINESE_SIMPLIFIED     213
+#define IDC_LANGITALIAN                 214
+#define IDC_LANGJAPANESE                215
+#define IDM_MGPU                        219
+#define IDM_SGPU                        220
 #define IDC_FRAMESKIPAUTO               221
 #define IDC_8_BIT                       302
 #define IDC_16_BIT                      303
@@ -690,7 +693,6 @@
 #define IDM_FILE_RECORDWAV              40017
 #define IDM_EXPORTBACKUPMEMORY          40018
 #define IDM_STOPMOVIE                   40019
-#define IDC_LANG_CHINESE_SIMPLIFIED     40020
 #define IDM_SCREENSEP_NDSGAP2           40021
 #define IDM_SCREENSEP_DRAGEDIT          40022
 #define IDM_SCREENSEP_COLORWHITE        40023
@@ -805,13 +807,12 @@
 #define IDM_RENDER_HQ2XS                60081
 #define IDM_RENDER_LQ2X                 60082
 #define IDM_RENDER_LQ2XS                60083
-#define IDC_LANGITALIAN                 60084
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        105
+#define _APS_NEXT_RESOURCE_VALUE        106
 #define _APS_NEXT_COMMAND_VALUE         40008
 #define _APS_NEXT_CONTROL_VALUE         1020
 #define _APS_NEXT_SYMED_VALUE           101
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index fdcd03790..6116936f5 100644
Binary files a/desmume/src/windows/resources.rc and b/desmume/src/windows/resources.rc differ