diff --git a/AUTHORS b/AUTHORS
index a99b67e..204e112 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Grazieno Pellegrino <grazieno@gmail.com>
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
 Leandro Nunes dos Santos <leandronunes@gmail.com>
+Martín Olivera <molivera@solar.org.ar>
 Moises Machado <moises@colivre.coop.br>
 Raphaël Rousseau <raph@r4f.org>
 Rodrigo Souto <rodrigo@colivre.coop.br>
diff --git a/public/500.html b/public/500.html
index 1e7c0f3..fd1bfe9 100644
--- a/public/500.html
+++ b/public/500.html
@@ -42,6 +42,18 @@
       </div>
     
       
+      <div id='es' style='display: none' class='message'>
+        <h1>Temporary system problem</h1>
+        <p>
+        Our technical team is working on it, please try again later. Sorry for the inconvenience.
+        </p>
+        <ul>
+          <li><a href='javascript: history.back()'>Go back</a></li>
+          <li><a href='/'>Go to the site home page</a></li>
+        </ul>
+      </div>
+    
+      
       <div id='fr' style='display: none' class='message'>
         <h1>Problème temporaire du système.</h1>
         <p>
@@ -95,6 +107,8 @@
       
         <a href="javascript: display_error_message('en')">English</a>
       
+        <a href="javascript: display_error_message('es')">Español</a>
+      
         <a href="javascript: display_error_message('fr')">Français</a>
       
         <a href="javascript: display_error_message('hy')">հայերեն լեզու</a>
diff --git a/public/503.html b/public/503.html
index 819e6ea..17f9520 100644
--- a/public/503.html
+++ b/public/503.html
@@ -35,6 +35,14 @@
       </div>
     
       
+      <div id='es' style='display: none' class='message'>
+        <h1>System maintainance</h1>
+        <p>
+        This system is under maintainance. It should be back in a few hours.
+        </p>
+      </div>
+    
+      
       <div id='fr' style='display: none' class='message'>
         <h1>Maintenance du système</h1>
         <p>
@@ -72,6 +80,8 @@
       
         <a href="javascript: display_error_message('en')">English</a>
       
+        <a href="javascript: display_error_message('es')">Español</a>
+      
         <a href="javascript: display_error_message('fr')">Français</a>
       
         <a href="javascript: display_error_message('hy')">հայերեն լեզու</a>
--
libgit2 0.21.2