diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8cb4a38f5a..de28902834 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,18 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-04-03 04:08 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * config/lang2po.hb
+  * tests/langchk.hb
+    ! fixed filter to allow pt_br and other non-legacy lang ids
+      to pass
+
+  * src/lang/l_en_tpl.c
+    % deleted outdated information
+
+  * src/lang/l_pt_br.c
+    * updated automatically
+
 2013-04-03 03:33 UTC+0200 Viktor Szakats (harbour syenar.net)
   * config/lang.hb
   * contrib/hbrun/hbrun.hbp
diff --git a/config/lang2po.hb b/config/lang2po.hb
index 3107919242..a1ad023e7d 100644
--- a/config/lang2po.hb
+++ b/config/lang2po.hb
@@ -71,7 +71,7 @@ STATIC FUNCTION CoreLangList()
       cName := __dynsGetName( tmp )
       IF LEFTEQUAL( cName, "HB_LANG_" )
          cName := SubStr( cName, Len( "HB_LANG_" ) + 1 )
-         IF Len( cName ) != 5 .AND. ;
+         IF ( Len( cName ) != 5 .OR. "_" $ cName ) .AND. ;
             ! "|" + cName + "|" $ "|RUKOI8|UAKOI8|ZHB5|ZHGB|"
             AAdd( aList, Lower( Left( cName, 2 ) ) + SubStr( cName, 3 ) )
          ENDIF
diff --git a/src/lang/l_en_tpl.c b/src/lang/l_en_tpl.c
index 19b717fa03..53273e088f 100644
--- a/src/lang/l_en_tpl.c
+++ b/src/lang/l_en_tpl.c
@@ -1,50 +1,3 @@
-/*
- * Harbour Project source code:
- * Language Support Module (en) (Template)
- *
- * Copyright 1999-2005 {list of individual authors and e-mail addresses}
- * www - http://harbour-project.org
- *
- * 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; either version 2, or (at your option)
- * any later version.
- *
- * 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 software; see the file COPYING.txt.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
- *
- * As a special exception, the Harbour Project gives permission for
- * additional uses of the text contained in its release of Harbour.
- *
- * The exception is that, if you link the Harbour libraries with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the Harbour library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the Harbour
- * Project under the name Harbour.  If you copy code from other
- * Harbour Project or Free Software Foundation releases into a copy of
- * Harbour, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for Harbour, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- *
- */
 
 #include "hbapilng.h"
 
@@ -56,7 +9,7 @@ static HB_LANG s_lang =
       "en",                        /* ISO ID (2 chars) */
       "English",                   /* Name (in English) */
       "English",                   /* Name (in native language) */
-      "EN",                        /* RFC ID */
+      "",
       "UTF8",                      /* Codepage */
       "",                          /* Version */
 
diff --git a/src/lang/l_pt_br.c b/src/lang/l_pt_br.c
index c3a53a1474..0a61bab3c8 100644
--- a/src/lang/l_pt_br.c
+++ b/src/lang/l_pt_br.c
@@ -7,7 +7,7 @@ static HB_LANG s_lang =
    {
       /* Identification */
 
-      "pt_br",
+      "pt_BR",
       "Portuguese",
       "Portugues",
       "",
diff --git a/tests/langchk.hb b/tests/langchk.hb
index c2462434e7..093dbf81c4 100644
--- a/tests/langchk.hb
+++ b/tests/langchk.hb
@@ -33,7 +33,7 @@ PROCEDURE Main()
       cName := __dynsGetName( tmp )
       IF LEFTEQUAL( cName, "HB_LANG_" )
          cName := SubStr( cName, Len( "HB_LANG_" ) + 1 )
-         IF Len( cName ) != 5 .AND. ;
+         IF ( Len( cName ) != 5 .OR. "_" $ cName ) .AND. ;
             ! "|" + cName + "|" $ "|RUKOI8|UAKOI8|ZHB5|ZHGB|"
             cPO += PadR( Lower( cName ), 6 ) + ' "' + hb_langMessage( HB_LANG_ITEM_BASE_NATMSG, cName ) + '"' + hb_eol()
          ENDIF