diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e487138464..95d2694307 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,25 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-01 11:36 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/make.hbs
+    ! Fixed to not define _HB_BUILD_ when doing a custom build
+      (explicitly passed .hbp file) in stdalone mode.
+
+  * contrib/hbnetio/utils/hbnetio/netiosrv.prg
+    + Enabled keepsort on the saved configuration hash.
+
+  * contrib/hbhpdf/harupdf.c
+    - Deleted wrapper to HPDF_PDFA_GENERATEID(), what rather seems
+      an internal function.
+    * Tweaked previous fix to HPDF_PDFA_SETPDFACONFORMANCE(), so that
+      now it's included in dynamic builds, just returning dummy result.
+      Still a pending TOFIX though, as it's not right that dynamic
+      and static version of the same lib works differently. Any tips
+      which way to choose? It would be great asking libharu developers
+      about whether HPDF_PDFA_SetPDFAConformance() is meant as a
+      public function.
+
 2011-02-01 03:34 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/vm/hashfunc.c
   * harbour/src/vm/hashes.c
diff --git a/harbour/contrib/hbhpdf/harupdf.c b/harbour/contrib/hbhpdf/harupdf.c
index 99f8d59dcf..10e4a59281 100644
--- a/harbour/contrib/hbhpdf/harupdf.c
+++ b/harbour/contrib/hbhpdf/harupdf.c
@@ -2679,39 +2679,22 @@ HB_FUNC( HPDF_LOADICCPROFILEFROMFILE )
 #endif
 }
 
-/* NOTE: These functions are not exported from libharu. Until we find
-         out it is design decision or bug, I explude them from dynamic
-         builds. [vszakats] */
-#if ! defined( HB_DYNLIB )
-
 /*
 HPDF_STATUS
 HPDF_PDFA_SetPDFAConformance (HPDF_Doc pdf,HPDF_PDFAType pdfatype)
 */
 HB_FUNC( HPDF_PDFA_SETPDFACONFORMANCE )
 {
-#if HB_HPDF_VERS( 2, 2, 0 )
+/* TOFIX: These functions are not exported from libharu. Until we find
+          out it is design decision or bug, I excluded them from dynamic
+          builds. [vszakats] */
+#if HB_HPDF_VERS( 2, 2, 0 ) && ! defined( HB_DYNLIB )
    hb_retnl( HPDF_PDFA_SetPDFAConformance( HPDF_Doc_par( 1 ), ( HPDF_PDFAType ) hb_parni( 2 ) ) );
 #else
    hb_retnl( -1 );
 #endif
 }
 
-/*
-HPDF_STATUS
-HPDF_PDFA_GenerateID(HPDF_Doc pdf)
-*/
-HB_FUNC( HPDF_PDFA_GENERATEID )
-{
-#if HB_HPDF_VERS( 2, 2, 0 )
-   hb_retnl( HPDF_PDFA_GenerateID( HPDF_Doc_par( 1 ) ) );
-#else
-   hb_retnl( -1 );
-#endif
-}
-
-#endif
-
 /*----------------------------------------------------------------------*/
 
 /*
diff --git a/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg b/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
index 526ff225bf..86a6666373 100644
--- a/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
+++ b/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
@@ -286,7 +286,7 @@ STATIC FUNCTION netiosrv_ConfName()
 STATIC FUNCTION netiosrv_ConfSave( netiosrv, netiomgm )
    LOCAL hConf := { => }
 
-// hb_HKeepOrder( hConf, .T. )
+   hb_HKeepOrder( hConf, .T. )
 
    hConf[ "signature" ]    := _NETIOSRV_SIGNATURE
    hConf[ "version" ]      := 1
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index f4d0eaefe2..6b16dca387 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -67,9 +67,6 @@ STATIC s_cReBase
 PROCEDURE Main( ... )
    LOCAL hProjectList
 
-   /* Signal that we're doing a Harbour build */
-   hb_setenv( "_HB_BUILD_", "yes" )
-
    s_cBase := ""
    s_cReBase := ""
    IF Empty( GetEnv( "HB_HOST_BIN_DIR" ) )
@@ -368,6 +365,9 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption
 
    LOCAL nErrorLevel
 
+   /* Signal that we're doing a Harbour build */
+   hb_setenv( "_HB_BUILD_", "yes" )
+
    /* Preprocessing */
 
    IF Len( hProjectReqList ) > 1