diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4ce31eaf3b..1746ee6578 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+20000414-22:10 GMT+1 Victor Szakats <info@szelvesz.hu>
+
+   + tests/langapi.prg
+   * tests/Makefile
+     + Test program added for Language API
+
 20000414-22:03 GMT+1 Victor Szakats <info@szelvesz.hu>
 
    * make_gnu.*
diff --git a/harbour/source/rtl/msgxxx.c b/harbour/source/rtl/msgxxx.c
deleted file mode 100644
index 18b32151ed..0000000000
--- a/harbour/source/rtl/msgxxx.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * $Id$
- */
-
-/*
- * Harbour Project source code:
- * Localization module includer for GNU compilers
- *
- * Copyright 1999 Gonzalo Diethelm <gonzalo.diethelm@iname.com>
- * www - http://www.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 of the License, or
- * (at your option) any later version, with one exception:
- *
- * The exception is that if you link the Harbour Runtime Library (HRL)
- * and/or the Harbour Virtual Machine (HVM) 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 HRL
- * and/or HVM code into it.
- *
- * 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 program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
- * their web site at http://www.gnu.org/).
- *
- */
-
-/* NOTE: This is only a container source file, don't put real program
-         code here. */
-
-#include "hbsetup.h"
-#include "hbdate.h"
-
-#if   defined(HARBOUR_LANGUAGE_EU)
-   #include "natmsg/msgeu.c"
-#elif defined(HARBOUR_LANGUAGE_NL)
-   #include "natmsg/msgnl.c"
-#elif defined(HARBOUR_LANGUAGE_EO)
-   #include "natmsg/msgeo.c"
-#elif defined(HARBOUR_LANGUAGE_GL)
-   #include "natmsg/msggl.c"
-#elif defined(HARBOUR_LANGUAGE_DE)
-   #include "natmsg/msgde.c"
-#elif defined(HARBOUR_LANGUAGE_ID)
-   #include "natmsg/msgid.c"
-#elif defined(HARBOUR_LANGUAGE_HU852)
-   #include "natmsg/msghu852.c"
-#elif defined(HARBOUR_LANGUAGE_HUCWI)
-   #include "natmsg/msghucwi.c"
-#elif defined(HARBOUR_LANGUAGE_HUWIN)
-   #include "natmsg/msghuwin.c"
-#elif defined(HARBOUR_LANGUAGE_KO)
-   #include "natmsg/msgko.c"
-#elif defined(HARBOUR_LANGUAGE_PT)
-   #include "natmsg/msgpt.c"
-#elif defined(HARBOUR_LANGUAGE_RUWIN)
-   #include "natmsg/msgruwin.c"
-#elif defined(HARBOUR_LANGUAGE_RU886)
-   #include "natmsg/msgru886.c"
-#elif defined(HARBOUR_LANGUAGE_ES)
-   #include "natmsg/msges.c"
-#elif defined(HARBOUR_LANGUAGE_CA)
-   #include "natmsg/msgca.c"
-#elif defined(HARBOUR_LANGUAGE_IT)
-   #include "natmsg/msgit.c"
-#elif defined(HARBOUR_LANGUAGE_FR)
-   #include "natmsg/msgfr.c"
-#elif defined(HARBOUR_LANGUAGE_CS852)
-   #include "natmsg/msgcs852.c"
-#elif defined(HARBOUR_LANGUAGE_CSKAM)
-   #include "natmsg/msgcskam.c"
-#elif defined(HARBOUR_LANGUAGE_SR852)
-   #include "natmsg/msgsr852.c"
-#elif defined(HARBOUR_LANGUAGE_PL852)
-   #include "natmsg/msgpl852.c"
-#elif defined(HARBOUR_LANGUAGE_PLMAZ)
-   #include "natmsg/msgplmaz.c"
-#elif defined(HARBOUR_LANGUAGE_HE862)
-   #include "natmsg/msghe862.c"
-#elif defined(HARBOUR_LANGUAGE_HEWIN)
-   #include "natmsg/msghewin.c"
-#elif defined(HARBOUR_LANGUAGE_ZHGB)
-   #include "natmsg/msgzhgb.c"
-#elif defined(HARBOUR_LANGUAGE_ZHBIG)
-   #include "natmsg/msgzhbig.c"
-#else
-   #include "natmsg/msgen.c"
-#endif
-
diff --git a/harbour/tests/Makefile b/harbour/tests/Makefile
index 243bd28e98..13aa99fbec 100644
--- a/harbour/tests/Makefile
+++ b/harbour/tests/Makefile
@@ -84,6 +84,7 @@ PRG_SOURCES=\
 	inline.prg \
 	iotest.prg \
 	iotest2.prg \
+        langapi.prg \
 	longdev.prg \
 	longstr.prg \
 	longstr2.prg \
diff --git a/harbour/tests/langapi.prg b/harbour/tests/langapi.prg
new file mode 100644
index 0000000000..2ca6aa8eef
--- /dev/null
+++ b/harbour/tests/langapi.prg
@@ -0,0 +1,33 @@
+/*
+ * $Id$
+ */
+
+// ; Donated to the public domain by Victor Szakats <info@szelvesz.hu>
+
+REQUEST HB_LANG_HU852
+
+func main()
+
+// hb_langselect( "EN" )
+
+? NationMsg( 1 )
+? CMonth( Date() )
+? CDOW( Date() )
+? "---------"
+
+hb_langSelect( "HU852" )
+
+? NationMsg( 1 )
+? CMonth( Date() )
+? CDOW( Date() )
+? "---------"
+
+hb_langSelect( "NOTHERE" )
+
+? NationMsg( 1 )
+? CMonth( Date() )
+? CDOW( Date() )
+? "---------"
+
+return nil
+