diff --git a/ChangeLog.txt b/ChangeLog.txt
index 3d88ba6ff8..875ed95413 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,17 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-04-04 16:09 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * config/lang.hb
+  * utils/hbmk2/hbmk2.hbp
+  * contrib/hbrun/doc/hbrun.es_ES.md -> contrib/hbrun/doc/hbrun.es.md
+  * utils/hbmk2/doc/hbmk2.es_ES.md -> utils/hbmk2/doc/hbmk2.es.md
+  * utils/hbmk2/po/hbmk2.es_ES.po -> utils/hbmk2/po/hbmk2.es.po
+    * 'es_ES' -> 'es'
+    ; General rule is to support the "root" language and any number
+      of additional dialects, f.e. 'es'+'es_419', 'pt'+'pt_BR', 'fr').
+      (as opposed to dialects only, f.e. 'es_ES'+'es_419', 'pt_PT'+'pt_BR', 'fr_FR')
+
 2013-04-04 16:02 UTC+0200 Viktor Szakats (harbour syenar.net)
   * bin/commit.hb
     + improvements to help workflow at pre-ChangeLog editing
diff --git a/config/lang.hb b/config/lang.hb
index c1ffddeb3e..bc2c1b6159 100644
--- a/config/lang.hb
+++ b/config/lang.hb
@@ -40,8 +40,7 @@ STATIC sc_hLangMapping := { ;
    "zh_CN"        => "zh_tra", ;
    "zh_CN.GB2312" => "zh_sim", ;
    "sr"           => "sr_cyr", ;
-   "sr@latin"     => "sr_lat", ;
-   "es_ES"        => "es" }   /* TODO: Synchronize Harbour with Transifex */
+   "sr@latin"     => "sr_lat" }
 
 PROCEDURE Main( cCommand, cMain, ... )
 
diff --git a/contrib/hbrun/doc/hbrun.es_ES.md b/contrib/hbrun/doc/hbrun.es.md
similarity index 100%
rename from contrib/hbrun/doc/hbrun.es_ES.md
rename to contrib/hbrun/doc/hbrun.es.md
diff --git a/utils/hbmk2/doc/hbmk2.es_ES.md b/utils/hbmk2/doc/hbmk2.es.md
similarity index 100%
rename from utils/hbmk2/doc/hbmk2.es_ES.md
rename to utils/hbmk2/doc/hbmk2.es.md
diff --git a/utils/hbmk2/hbmk2.hbp b/utils/hbmk2/hbmk2.hbp
index 205d1c2b91..9e26fb60f7 100644
--- a/utils/hbmk2/hbmk2.hbp
+++ b/utils/hbmk2/hbmk2.hbp
@@ -29,7 +29,7 @@ hbmk2.rc
 # localization
 po/hbmk2.%{hb_lng}.po
 -hbl=hbmk2.%{hb_lng}.hbl
--lng=el,es_419,es_ES,fr,gl,hu,it,pt_BR
+-lng=el,es,es_419,fr,gl,hu,it,pt_BR
 
 # localization (automatization)
 -3rd=_langhb_docext=.md
diff --git a/utils/hbmk2/po/hbmk2.es_ES.po b/utils/hbmk2/po/hbmk2.es.po
similarity index 100%
rename from utils/hbmk2/po/hbmk2.es_ES.po
rename to utils/hbmk2/po/hbmk2.es.po