diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 23e850124f..10e09a566c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-18 21:37 UTC+0600 April White (april users.sourceforge.net)
+  + include/hbextlng.ch
+    ; as created by hbextern
+  * ChangeLog - improved comments for 2009-07-18 21:20, below
+
 2009-07-18 21:24 UTC+0600 April White (april users.sourceforge.net)
   + examples/hbextern/hbextern.lst
     ; used by hbextern to build contrib external headers
@@ -26,6 +31,8 @@
     - legacy directory listing deprecated and removed
     - removed 'recursive' flags, now default behaviour
     * altered internal structure to allow for multiple output files
+    + filter out CODEPAGE and LANG symbols into their own files
+    + place contrib symbols into their own file; controlled by hbextern.lst
 
 2009-07-18 19:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbssl/Makefile
diff --git a/harbour/include/hbextlng.ch b/harbour/include/hbextlng.ch
new file mode 100644
index 0000000000..246fbb7e36
--- /dev/null
+++ b/harbour/include/hbextlng.ch
@@ -0,0 +1,127 @@
+/*
+ * $Id$
+*/
+
+/*
+ * Harbour Project source code:
+ * Harbour hbextlng.ch contrib external header
+ *
+ * Copyright 2009 April White <april users.sourceforge.net>
+ * 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, 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.  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.
+ *
+ */
+
+#ifndef HB_EXTLNG_CH_
+#define HB_EXTLNG_CH_
+
+/* lang support */
+
+EXTERNAL HB_LANG_BE866
+EXTERNAL HB_LANG_BEWIN
+EXTERNAL HB_LANG_BG866
+EXTERNAL HB_LANG_BGISO
+EXTERNAL HB_LANG_BGMIK
+EXTERNAL HB_LANG_BGWIN
+EXTERNAL HB_LANG_CA
+EXTERNAL HB_LANG_CS852
+EXTERNAL HB_LANG_CSISO
+EXTERNAL HB_LANG_CSKAM
+EXTERNAL HB_LANG_CSWIN
+EXTERNAL HB_LANG_DE
+EXTERNAL HB_LANG_DEWIN
+EXTERNAL HB_LANG_EL
+EXTERNAL HB_LANG_ELWIN
+EXTERNAL HB_LANG_EO
+EXTERNAL HB_LANG_ES
+EXTERNAL HB_LANG_ESWIN
+EXTERNAL HB_LANG_EU
+EXTERNAL HB_LANG_FR
+EXTERNAL HB_LANG_GL
+EXTERNAL HB_LANG_HE862
+EXTERNAL HB_LANG_HEWIN
+EXTERNAL HB_LANG_HR437
+EXTERNAL HB_LANG_HR852
+EXTERNAL HB_LANG_HRISO
+EXTERNAL HB_LANG_HRWIN
+EXTERNAL HB_LANG_HU852
+EXTERNAL HB_LANG_HUCWI
+EXTERNAL HB_LANG_HUISO
+EXTERNAL HB_LANG_HUWIN
+EXTERNAL HB_LANG_ID
+EXTERNAL HB_LANG_IS850
+EXTERNAL HB_LANG_IT
+EXTERNAL HB_LANG_KO
+EXTERNAL HB_LANG_LTWIN
+EXTERNAL HB_LANG_NL
+EXTERNAL HB_LANG_PL852
+EXTERNAL HB_LANG_PLISO
+EXTERNAL HB_LANG_PLMAZ
+EXTERNAL HB_LANG_PLWIN
+EXTERNAL HB_LANG_PT
+EXTERNAL HB_LANG_PTISO
+EXTERNAL HB_LANG_RO
+EXTERNAL HB_LANG_RU866
+EXTERNAL HB_LANG_RUKOI8
+EXTERNAL HB_LANG_RUWIN
+EXTERNAL HB_LANG_SK852
+EXTERNAL HB_LANG_SKISO
+EXTERNAL HB_LANG_SKKAM
+EXTERNAL HB_LANG_SKWIN
+EXTERNAL HB_LANG_SL437
+EXTERNAL HB_LANG_SL852
+EXTERNAL HB_LANG_SLISO
+EXTERNAL HB_LANG_SLWIN
+EXTERNAL HB_LANG_SR852
+EXTERNAL HB_LANG_SRISO
+EXTERNAL HB_LANG_SRWIN
+EXTERNAL HB_LANG_TR857
+EXTERNAL HB_LANG_TRWIN
+EXTERNAL HB_LANG_UA866
+EXTERNAL HB_LANG_UADOS
+EXTERNAL HB_LANG_UAKOI8
+EXTERNAL HB_LANG_UAWIN
+EXTERNAL HB_LANG_ZHB5
+EXTERNAL HB_LANG_ZHGB
+
+/* End of lang support */
+
+#endif /* HB_EXTLNG_CH_ */