diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c030773293..744e3efce8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,21 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-22 08:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/axcore.c
+    + My previous change reapplied after it has been overwritten/lost
+      by previous commit.
+      Pritpal, pls verify your workflow, this was a very small change
+      but it's just out of luck I noticed it has been undone and it
+      could be something important in another case. Please 'svn update'
+      before committing and edit files directly in your sandbox. I'm
+      writing this because such lost committed modification happened
+      already a few times in the past. Thank you.
+
+  * config/global.mk
+    + Including optional config/conf.mk file.
+      Such file may be created by configure session.
+
 2009-08-21 19:19 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/gtwvg/wvgax.prg
   * contrib/gtwvg/wvgsink.c
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index a1341aa8b6..fd6f864614 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -30,6 +30,8 @@
 ifeq ($(GLOBAL_CF_),)
 GLOBAL_CF_ := yes
 
+-include $(TOP)$(ROOT)config/conf.mk
+
 # This isn't strictly necessary, but it does signficantly reduce
 # the number of rules that make has to evaluate otherwise, which may give
 # a performance boost on a slow system.
diff --git a/harbour/contrib/hbwin/axcore.c b/harbour/contrib/hbwin/axcore.c
index 4f633db6c8..10dc50fbb6 100644
--- a/harbour/contrib/hbwin/axcore.c
+++ b/harbour/contrib/hbwin/axcore.c
@@ -321,7 +321,7 @@ static HRESULT STDMETHODCALLTYPE Invoke( IDispatch* lpThis, DISPID dispid, REFII
    if( ! IsEqualIID( riid, HB_ID_REF( IID_NULL ) ) )
       return DISP_E_UNKNOWNINTERFACE;
 
-   if( ! ( ( ISink* ) lpThis)->pItemHandler )
+   if( ! ( ( ISink* ) lpThis )->pItemHandler )
       return S_OK;
 
    pAction = ( ( ISink* ) lpThis )->pItemHandler;