diff --git a/language/es_MX/common.lang.php b/language/es_MX/common.lang.php
new file mode 100644
index 000000000..89c2754b3
--- /dev/null
+++ b/language/es_MX/common.lang.php
@@ -0,0 +1,69 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+/*
+Language Name: México [MX]
+Version: 2.6.0
+Language URI: http://piwigo.org/ext/extension_view.php?eid=726
+Author: Piwigo team
+Author URI: http://piwigo.org
+*/
+
+// Langage informations
+$lang_info['language_name'] = 'México';
+$lang_info['country'] = 'Mexico';
+$lang_info['direction'] = 'ltr';
+$lang_info['code'] = 'es';
+$lang_info['zero_plural'] = true;
+
+$lang['%d comments'] = '%d comentarios';
+$lang['%d hit'] = '%d vista';
+$lang['%d hits'] = '%d vistas';
+$lang['%d Kb'] = '%d Kb';
+$lang['%d new comment'] = '%d nuevo comentario';
+$lang['%d new comments'] = '%d nuevos comentarios';
+$lang['%d new photo'] = '%d nueva foto';
+$lang['%d new photos'] = '%d nueva foto';
+$lang['%d new user'] = '%d nuevo usuario';
+$lang['%d new users'] = '%d nuevos usuarios';
+$lang['Date'] = 'Fecha';
+$lang['day'][0] = 'Domingo';
+$lang['day'][1] = 'Lunes';
+$lang['day'][2] = 'Martes';
+$lang['day'][3] = 'Miércoles';
+$lang['day'][4] = 'Jueves';
+$lang['day'][5] = 'Viernes';
+$lang['day'][6] = 'Sábado';
+$lang['month'][10] = 'octubre';
+$lang['month'][11] = 'Noviembre';
+$lang['month'][12] = 'Diciembre';
+$lang['month'][1] = 'Enero';
+$lang['month'][2] = 'Febrero';
+$lang['month'][3] = 'Marzo';
+$lang['month'][4] = 'Abril';
+$lang['month'][5] = 'Mayo';
+$lang['month'][6] = 'Junio';
+$lang['month'][7] = 'Julio';
+$lang['month'][8] = 'Agosto';
+$lang['month'][9] = 'Septiembre';
+
+?>
\ No newline at end of file
diff --git a/language/es_MX/es_MX.jpg b/language/es_MX/es_MX.jpg
new file mode 100644
index 000000000..0b0ceb286
Binary files /dev/null and b/language/es_MX/es_MX.jpg differ
diff --git a/language/es_MX/iso.txt b/language/es_MX/iso.txt
new file mode 100644
index 000000000..c9a7d1616
--- /dev/null
+++ b/language/es_MX/iso.txt
@@ -0,0 +1 @@
+México [MX]
\ No newline at end of file