diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fc68e7515b..a628217f91 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,28 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-05-08 17:51 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * config/postinst.hbs
+    * implemented same ASORT() fix as in prev commit by Przemek.
+      (it may be important once we modify hbrun/hbmk2 to run
+      scripts under UTF8 CP)
+
+  * contrib/hbnetio/utils/hbnetio/modules.hbp
+  - contrib/hbnetio/utils/hbnetio/rpcdemo.hbs
+  + contrib/hbnetio/utils/hbnetio/rpcdemo.hb
+  - contrib/hbide/plugins/hbide_script_qtgui.hbs
+  + contrib/hbide/plugins/hbide_script_qtgui.hb
+  - contrib/hbide/plugins/hbide_plugin_savebackup.hbs
+  + contrib/hbide/plugins/hbide_plugin_savebackup.hb
+  - utils/hbmk2/examples/plug_tpl.hbs
+  + utils/hbmk2/examples/plug_tpl.hb
+  - tests/stripdoc.hbs
+  + tests/stripdoc.hb
+    * .hbs -> .hb for Harbour scripts.
+
+  * tests/stripdoc.hb
+    + use directry.ch
+
 2012-05-08 17:47 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/utils/hbmk2/hbmk2.prg
     ! sort functions in .hbx files using "EN" CP.
diff --git a/harbour/config/postinst.hbs b/harbour/config/postinst.hbs
index 1722c34223..3c5d195e28 100644
--- a/harbour/config/postinst.hbs
+++ b/harbour/config/postinst.hbs
@@ -560,7 +560,9 @@ STATIC FUNCTION __hb_extern_get_list( cInputName )
                      hExtern[ tmp[ 2 ] ] := NIL
                   ENDIF
                NEXT
+               tmp := hb_cdpSelect( "EN" )
                ASort( aExtern,,, {| tmp, tmp1 | tmp < tmp1 } )
+               hb_cdpSelect( tmp )
             ENDIF
          ENDIF
          IF ! Empty( cTempFile )
diff --git a/harbour/contrib/hbide/plugins/hbide_plugin_savebackup.hbs b/harbour/contrib/hbide/plugins/hbide_plugin_savebackup.hb
similarity index 100%
rename from harbour/contrib/hbide/plugins/hbide_plugin_savebackup.hbs
rename to harbour/contrib/hbide/plugins/hbide_plugin_savebackup.hb
diff --git a/harbour/contrib/hbide/plugins/hbide_script_qtgui.hbs b/harbour/contrib/hbide/plugins/hbide_script_qtgui.hb
similarity index 100%
rename from harbour/contrib/hbide/plugins/hbide_script_qtgui.hbs
rename to harbour/contrib/hbide/plugins/hbide_script_qtgui.hb
diff --git a/harbour/contrib/hbnetio/utils/hbnetio/modules.hbp b/harbour/contrib/hbnetio/utils/hbnetio/modules.hbp
index b304a709b7..3e415a0097 100644
--- a/harbour/contrib/hbnetio/utils/hbnetio/modules.hbp
+++ b/harbour/contrib/hbnetio/utils/hbnetio/modules.hbp
@@ -4,4 +4,3 @@
 
 -gh
 *.hb
-*.hbs
diff --git a/harbour/contrib/hbnetio/utils/hbnetio/rpcdemo.hbs b/harbour/contrib/hbnetio/utils/hbnetio/rpcdemo.hb
similarity index 88%
rename from harbour/contrib/hbnetio/utils/hbnetio/rpcdemo.hbs
rename to harbour/contrib/hbnetio/utils/hbnetio/rpcdemo.hb
index bc0973bc33..620c56b8f0 100644
--- a/harbour/contrib/hbnetio/utils/hbnetio/rpcdemo.hbs
+++ b/harbour/contrib/hbnetio/utils/hbnetio/rpcdemo.hb
@@ -4,7 +4,7 @@
 
 /*
  * RPC demo module for hbnetio server.
- *    Usage: 'hbnetio -rpc=rpcdemo.hbs'
+ *    Usage: 'hbnetio -rpc=rpcdemo.hb'
  *
  * Copyright 2010 Viktor Szakats (harbour syenar.net)
  * www - http://www.harbour-project.org
diff --git a/harbour/tests/stripdoc.hbs b/harbour/tests/stripdoc.hb
similarity index 95%
rename from harbour/tests/stripdoc.hbs
rename to harbour/tests/stripdoc.hb
index 6a95267386..de66f22cbd 100644
--- a/harbour/tests/stripdoc.hbs
+++ b/harbour/tests/stripdoc.hb
@@ -10,7 +10,7 @@
  *
  */
 
-#define F_NAME 1
+#include "directry.ch"
 
 PROCEDURE Main()
    LOCAL aFile
diff --git a/harbour/utils/hbmk2/examples/plug_tpl.hbs b/harbour/utils/hbmk2/examples/plug_tpl.hb
similarity index 100%
rename from harbour/utils/hbmk2/examples/plug_tpl.hbs
rename to harbour/utils/hbmk2/examples/plug_tpl.hb