--- ctxbase/core-con.lua	2014-09-10 23:13:00.000000000 +0200
+++ core-con.lua	2014-11-11 21:20:07.704095640 +0100
@@ -60,6 +60,14 @@
         0x006F, 0x0070, 0x0072, 0x0073, 0x0161,
         0x0074, 0x0075, 0x0076, 0x007A, 0x017E
     },
+    ['spanish'] = {
+        0x0061, 0x0062, 0x0063, 0x0064, 0x0065,
+        0x0066, 0x0067, 0x0068, 0x0069, 0x006A,
+        0x006B, 0x006C, 0x006D, 0x006E, 0x00F1,
+        0x006F, 0x0070, 0x0071, 0x0072, 0x0073,
+        0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
+        0x0079, 0x007A
+    },
     ['greek'] = { -- this should be the lowercase table
      -- 0x0391, 0x0392, 0x0393, 0x0394, 0x0395,
      -- 0x0396, 0x0397, 0x0398, 0x0399, 0x039A,
@@ -131,6 +139,7 @@
 counters['gr']                   = counters['greek']
 counters['g']                    = counters['greek']
 counters['sl']                   = counters['slovenian']
+counters['es']                   = counters['spanish']
 counters['kr']                   = counters['korean']
 counters['kr-p']                 = counters['korean-parent']
 counters['kr-c']                 = counters['korean-circle']
@@ -893,7 +902,7 @@
       [900] = "novecientos",
      [1000] = "mil",
    [1000^2] = "millón",
-   [1000^3] = "mil millónes",
+   [1000^3] = "mil millones",
    [1000^4] = "billón",
 }