diff --git a/src/i18n.c b/src/i18n.c
index aa8a403d7..0f02ee186 100644
--- a/src/i18n.c
+++ b/src/i18n.c
@@ -308,7 +308,8 @@ const language_to_locale_struct language_to_locale_array[] = {
   {"chinese", "zh_CN.UTF-8"},
   {"simplified-chinese", "zh_CN.UTF-8"},
   {"traditional-chinese", "zh_TW.UTF-8"},
-  {"zapoteco", "zw_MX.UTF-8"},
+  {"zapotec", "zam.UTF-8"},
+  {"miahuatlan-zapotec", "zam.UTF-8"},
   {"khmer", "km_KH.UTF-8"}
 };
 
@@ -564,7 +565,7 @@ void show_lang_usage(FILE * f, const char *const prg)
 /* wo */ "  wolof\n"
 /* cy */ "  welsh        cymraeg\n"
 /* xh */ "  xhosa\n"
-/* zw */ "  zapoteco\n"
+/* zam */"  zapotec      miahuatlan-zapotec\n"
 	  "\n", prg);
 }
 
@@ -660,7 +661,7 @@ void show_locale_usage(FILE * f, const char *const prg)
 	  "  wo_SN   (Wolof)\n"
 	  "  cy_GB   (Welsh        Cymraeg)\n"
 	  "  xh_ZA   (Xhosa)\n"
-	  "  zw_MX   (Zapoteco)\n"
+	  "  zam     (Zapoteco-Miahuatlan)\n"
 	  "\n", prg);
 }
 
diff --git a/src/i18n.h b/src/i18n.h
index 14dd0fe19..1bec5a66b 100644
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -10,7 +10,7 @@
 
   $Id$
   
-  June 14, 2002 - October 26, 2008
+  June 14, 2002 - January 23, 2009
 */
 
 
@@ -107,7 +107,7 @@ enum
   LANG_XH,			/* Xhosa */
   LANG_ZH_CN,			/* Chinese (Simplified) */
   LANG_ZH_TW,			/* Chinese (Traditional) */
-  LANG_ZW,			/* Zapoteco */
+  LANG_ZAM,			/* Zapotec (Miahuatlan) */
   NUM_LANGS
 };
 
diff --git a/src/po/zw.po b/src/po/zam.po
similarity index 100%
rename from src/po/zw.po
rename to src/po/zam.po