diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index 566b3b62b..8e84bf255 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -2236,6 +2236,11 @@ void SetLanguage(int langid)
 		setLanguage(MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT));
 		SetThreadLocale(MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT));
 		break;
+	case LANGUAGE_SPANISH:
+		currLanguageMenuItem = IDC_LANGSPANISH;
+		setLanguage(MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT));
+		SetThreadLocale(MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT));
+		break;
 
 	default:
 		break;
@@ -3964,7 +3969,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
 			//Updated Checked menu items
 
 			//language choices
-			for(UINT i = IDC_LANGENGLISH; i < IDC_LANGJAPANESE+1; i++)
+			for(UINT i = IDC_LANGENGLISH; i < IDC_LANGSPANISH+1; i++)
 				MainWindow->checkMenu(i, i == currLanguageMenuItem);
 
 			//emulation menu
@@ -5350,6 +5355,9 @@ DOKEYDOWN:
 		case IDC_LANGJAPANESE:
 			ChangeLanguage(LANGUAGE_JAPANESE);
 			return 0;
+		case IDC_LANGSPANISH:
+			ChangeLanguage(LANGUAGE_SPANISH);
+			return 0;
 
 		case IDC_FRAMELIMIT:
 			FrameLimit ^= 1;
diff --git a/desmume/src/windows/main.h b/desmume/src/windows/main.h
index 4ee257b5f..0fc5a7968 100644
--- a/desmume/src/windows/main.h
+++ b/desmume/src/windows/main.h
@@ -37,6 +37,7 @@ static const int LANGUAGE_FRENCH = 1;
 static const int LANGUAGE_CHINESE = 3;
 static const int LANGUAGE_ITALIAN = 4;
 static const int LANGUAGE_JAPANESE = 5;
+static const int LANGUAGE_SPANISH = 6;
 
 extern void Change3DCoreWithFallbackAndSave(int newCore, int fallbackCore=GPU3D_SWRAST);
 
diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h
index 981ad8f9c..d3b5cdb12 100644
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@@ -100,6 +100,7 @@
 #define IDC_LANG_CHINESE_SIMPLIFIED     213
 #define IDC_LANGITALIAN                 214
 #define IDC_LANGJAPANESE                215
+#define IDC_LANGSPANISH                 216
 #define IDM_MGPU                        219
 #define IDM_SGPU                        220
 #define IDC_FRAMESKIPAUTO               221
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index 462b66e92..6d50a43ae 100644
Binary files a/desmume/src/windows/resources.rc and b/desmume/src/windows/resources.rc differ