diff --git a/Admin/Templates/editServerSet.tpl b/Admin/Templates/editServerSet.tpl
index 98c2680e..565926c0 100644
--- a/Admin/Templates/editServerSet.tpl
+++ b/Admin/Templates/editServerSet.tpl
@@ -153,6 +153,7 @@ function refresh(tz) {
                             <option value="en" <?php if ((defined('SERVER_LANG') ? SERVER_LANG : LANG)=="en") echo "selected";?>><?php echo ADM_ENGLISH; ?></option>
                             <option value="fr" <?php if ((defined('SERVER_LANG') ? SERVER_LANG : LANG)=="fr") echo "selected";?>><?php echo ADM_FRENCH; ?></option>
                             <option value="it" <?php if ((defined('SERVER_LANG') ? SERVER_LANG : LANG)=="it") echo "selected";?>><?php echo ADM_ITALIAN; ?></option>
+                            <option value="es" <?php if ((defined('SERVER_LANG') ? SERVER_LANG : LANG)=="es") echo "selected";?>><?php echo ADM_SPANISH; ?></option>
                             <option value="ro" <?php if ((defined('SERVER_LANG') ? SERVER_LANG : LANG)=="ro") echo "selected";?>><?php echo ADM_ROMANIAN; ?></option>
                             <option value="zh" <?php if ((defined('SERVER_LANG') ? SERVER_LANG : LANG)=="zh") echo "selected";?>><?php echo ADM_CHINESE; ?></option>
                         </select>
diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php
index e93b6e0f..366349db 100755
--- a/GameEngine/Lang/en.php
+++ b/GameEngine/Lang/en.php
@@ -3481,6 +3481,7 @@ tz_def('ADM_ENGLISH', 'English');
 tz_def('ADM_FRENCH', 'French');
 tz_def('ADM_ITALIAN', 'Italian');
 tz_def('ADM_ROMANIAN', 'Romanian');
+tz_def('ADM_SPANISH', 'Spanish');
 tz_def('ADM_CHINESE', 'Chinese');
 tz_def('ADM_SLOW', 'Slow');
 tz_def('ADM_FAST', 'Fast');
diff --git a/GameEngine/Lang/es.php b/GameEngine/Lang/es.php
index e93b6e0f..5ee394c6 100644
--- a/GameEngine/Lang/es.php
+++ b/GameEngine/Lang/es.php
@@ -3481,6 +3481,7 @@ tz_def('ADM_ENGLISH', 'English');
 tz_def('ADM_FRENCH', 'French');
 tz_def('ADM_ITALIAN', 'Italian');
 tz_def('ADM_ROMANIAN', 'Romanian');
+tz_def('ADM_SPANISH', 'Espanol');
 tz_def('ADM_CHINESE', 'Chinese');
 tz_def('ADM_SLOW', 'Slow');
 tz_def('ADM_FAST', 'Fast');
diff --git a/GameEngine/Lang/fr.php b/GameEngine/Lang/fr.php
index 04d308d2..1e610dd0 100644
--- a/GameEngine/Lang/fr.php
+++ b/GameEngine/Lang/fr.php
@@ -3424,6 +3424,7 @@ tz_def('ADM_ENGLISH', 'Anglais');
 tz_def('ADM_FRENCH', 'Français');
 tz_def('ADM_ITALIAN', 'Italien');
 tz_def('ADM_ROMANIAN', 'Roumain');
+tz_def('ADM_SPANISH', 'Espagnol');
 tz_def('ADM_CHINESE', 'Chinois');
 tz_def('ADM_SLOW', 'Lent');
 tz_def('ADM_FAST', 'Rapide');
diff --git a/GameEngine/Lang/it.php b/GameEngine/Lang/it.php
index 93cd3a4d..48bcfdf7 100755
--- a/GameEngine/Lang/it.php
+++ b/GameEngine/Lang/it.php
@@ -2258,3 +2258,4 @@ tz_def('MANUAL_FAQ', 'FAQ Travian');
 tz_def('MANUAL_FAQ_DESC', "Questo aiuto di gioco fornisce solo brevi informazioni. Maggiori informazioni sono disponibili sul");
 
 ?>
+tz_def('ADM_SPANISH', 'Spagnolo');
diff --git a/GameEngine/Lang/ro.php b/GameEngine/Lang/ro.php
index 47afea3c..02bf3ed2 100644
--- a/GameEngine/Lang/ro.php
+++ b/GameEngine/Lang/ro.php
@@ -3221,6 +3221,7 @@ tz_def('ADM_ENGLISH', 'Engleza');
 tz_def('ADM_FRENCH', 'Franceza');
 tz_def('ADM_ITALIAN', 'Italiana');
 tz_def('ADM_ROMANIAN', 'Romana');
+tz_def('ADM_SPANISH', 'Spaniola');
 tz_def('ADM_CHINESE', 'Chineza');
 tz_def('ADM_SLOW', 'Lent');
 tz_def('ADM_FAST', 'Rapid');
diff --git a/GameEngine/Lang/zh.php b/GameEngine/Lang/zh.php
index cf7bd073..35129dd7 100644
--- a/GameEngine/Lang/zh.php
+++ b/GameEngine/Lang/zh.php
@@ -2352,3 +2352,4 @@ tz_def('MANUAL_INTRO', '此游戏内帮助让你随时查阅重要信息。');
 tz_def('MANUAL_NEW_FEATURES_DESC', '这些是你在原版 Travian T3.6 游戏中找不到的新功能。你可以在此详细了解所有新功能。');
 tz_def('MANUAL_FAQ', 'Travian 常见问题');
 tz_def('MANUAL_FAQ_DESC', '此游戏内帮助仅提供简要信息。更多信息请访问');
+tz_def('ADM_SPANISH', '西班牙语');
diff --git a/Templates/Profile/preference.tpl b/Templates/Profile/preference.tpl
index 2e83fa3d..19493edf 100644
--- a/Templates/Profile/preference.tpl
+++ b/Templates/Profile/preference.tpl
@@ -532,6 +532,9 @@ if(isset($_POST['lang']))
             </option>
             <option value="it" <?php if($session->userinfo['lang']=="it") echo 'selected'; ?>>
                 <?php echo TZ_ITALIAN; ?>
+			</option>
+            <option value="es" <?php if($session->userinfo['lang']=="es") echo 'selected'; ?>>
+                <?php echo TZ_SPANISH; ?>
             </option>
         </select>
     </td>
diff --git a/install/templates/config.tpl b/install/templates/config.tpl
index 875ecce9..14b2d37f 100644
--- a/install/templates/config.tpl
+++ b/install/templates/config.tpl
@@ -121,7 +121,7 @@ $dbPrefix = $_SESSION['install_random_prefix'];
       </select>
     </div>
     <div><label>Language</label>
-      <select class="input" name="lang"><option value="en" selected>English</option><option value="fr">French</option><option value="it">Italian</option><option value="ro">Romanian</option><option value="zh">Chinese</option></select>
+      <select class="input" name="lang"><option value="en" selected>English</option><option value="fr">French</option><option value="it">Italian</option><option value="es">Spanish</option><option value="ro">Romanian</option><option value="zh">Chinese</option></select>
     </div>
     <div><label>Beginners protection</label>
       <select class="input" name="beginner">