diff --git a/development/Win32/packaging/AltInstaller/Updated.nsh b/development/Win32/packaging/AltInstaller/Updated.nsh
index cb4e544db6..b8b81b1fc3 100644
--- a/development/Win32/packaging/AltInstaller/Updated.nsh
+++ b/development/Win32/packaging/AltInstaller/Updated.nsh
@@ -14,6 +14,7 @@ Function UpdateModifiedFiles
  File "${PRODUCT_SOURCEDIR}\Resources\chkconfig.ltx"
  File "${PRODUCT_SOURCEDIR}\Resources\configure.py"
  File "${PRODUCT_SOURCEDIR}\Resources\external_templates"
+ File "${PRODUCT_SOURCEDIR}\Resources\languages"
  File "${PRODUCT_SOURCEDIR}\Resources\symbols"
  SetOutPath "$INSTDIR\Resources\doc"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\Customization.lyx"
diff --git a/lib/languages b/lib/languages
index 5d1dcf2c7e..8e7ca67306 100644
--- a/lib/languages
+++ b/lib/languages
@@ -77,7 +77,7 @@ serbian-latin     serbian	"Serbian (Latin)"	false  iso8859-2  sr_RS	 ""
 slovak      slovak	"Slovak"	false  iso8859-2  sk_SK	 ""
 slovene     slovene	"Slovene"	false  iso8859-2  sl_SI	 ""
 spanish     spanish	"Spanish"	false  iso8859-15 es_ES	 "\addto\shorthandsspanish{\spanishdeactivate{~<>}}"
-spanish-mexico     spanish	"Spanish (Mexico)"	false  iso8859-15 es_MX	 "\addto\extrasspanish{\renewcommand\shorthandsspanish{}}"
+spanish-mexico     spanish	"Spanish (Mexico)"	false  iso8859-15 es_MX	 "\addto\shorthandsspanish{\spanishdeactivate{~<>.}}"
 swedish     swedish	"Swedish"	false  iso8859-15 sv_SE	 ""
 thai        thai	"Thai"		false  tis620-0   th_TH	 "\usepackage{thswitch}"
 turkish     turkish	"Turkish"	false  iso8859-9  tr_TR	 ""
diff --git a/status.16x b/status.16x
index e1da035d49..edf9b7c43f 100644
--- a/status.16x
+++ b/status.16x
@@ -101,8 +101,11 @@ What's new
 - Fix bug that telephone number and location didn't appear in the output
   of letters (bug 5684).
 
-- Fix a LaTeX export error that prevents the inclusion of two program listings
-  that differ only by file extension (bug 5681).
+- Fix a LaTeX export error that prevents the inclusion of two program
+  listings that differ only by file extension (bug 5681).
+
+- Fix hyphenation and punctuation rules for Mexican Spanish (bug 4736). 
+
 
 * USER INTERFACE