diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 76f4fe3bdc..bd71ac7286 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-12 17:10 UTC+0800 Ron Pinkas <ron@profit-master.com>
+   * makefile.bc
+   * hb_slex.bc
+     * Changed to include new source\vm\estack.c
+
+   * include/hbextern.ch
+     * Changed HB_PVALUE() to __PVALUE()
+
 2000-12-12 21:15 GMT -3 Luiz Rafael Culik <culik@sl.conex.net>
 
 *utils/hbmake/hbmake.prg
@@ -36,10 +44,10 @@ TAGged all files with 'old-eval-stack' tag before commiting changes
     *source/vm/proc.c
         *changed to support the new eval stack code
         *added #include "hbstack.h" when hb_stack.Return was used
-        
+
 NOTE! some modules still use a direct access to the eval stack
-      internal architecture (hb_stack.pItems) - mostly in 
-      function/messages names lookup code      
+      internal architecture (hb_stack.pItems) - mostly in
+      function/messages names lookup code
 
     *source/vm/Makefile
         *added estack.c
@@ -50,13 +58,13 @@ NOTE! some modules still use a direct access to the eval stack
     *source/vm/pvalue.c
     *tests/multiarg.prg
         *renamed HB_PVALUE to __PVALUE
-        * __PVALUE is no longer an HB_EXTENSION - it is an internal 
+        * __PVALUE is no longer an HB_EXTENSION - it is an internal
         function now
 
     *include/hbexpra.c
         *renamed HB_PVALUE to __PVALUE
         *fixed support for __GETA to be compatible with the latest
-        Ron's changes in tgetint.prg       
+        Ron's changes in tgetint.prg
 
 2000-12-12 00:50 UTC-0800 Brian Hays <bhays@abacuslaw.com>
    * source/rtl/memoline.c
diff --git a/harbour/hb_slex.bc b/harbour/hb_slex.bc
index 4fcfe21f57..b6c1c62ee0 100644
--- a/harbour/hb_slex.bc
+++ b/harbour/hb_slex.bc
@@ -459,6 +459,7 @@ VM_LIB_OBJS = \
    $(OBJ_DIR)\codebloc.obj \
    $(OBJ_DIR)\debug.obj \
    $(OBJ_DIR)\dynsym.obj \
+   $(OBJ_DIR)\estack.obj \
    $(OBJ_DIR)\eval.obj \
    $(OBJ_DIR)\extend.obj \
    $(OBJ_DIR)\fm.obj \
@@ -612,7 +613,7 @@ HBMAKE_EXE_OBJS = \
    $(OBJ_DIR)\pickarry.obj \
    $(OBJ_DIR)\pickfile.obj \
    $(OBJ_DIR)\prb_stak.obj \
-   $(OBJ_DIR)\radios.obj 
+   $(OBJ_DIR)\radios.obj
 
 #
 # Our default target
@@ -636,7 +637,7 @@ all: \
    $(HBPP_EXE) \
    $(HBTEST_EXE) \
    $(HBDOC_EXE) \
-   $(HBMAKE_EXE) 
+   $(HBMAKE_EXE)
 
 #
 # Library dependencies and build rules
@@ -948,6 +949,10 @@ $(OBJ_DIR)\eval.obj : $(VM_DIR)\eval.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(VM_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\estack.obj : $(VM_DIR)\estack.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(VM_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\extend.obj : $(VM_DIR)\extend.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(VM_LIB) $(ARFLAGS) -+$@,,
diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch
index d7ca321605..faf8a2c33b 100644
--- a/harbour/include/hbextern.ch
+++ b/harbour/include/hbextern.ch
@@ -159,9 +159,7 @@ EXTERNAL PROCFILE
 //
 //symbols from file: vm\pvalue.c
 //
-#ifdef HB_EXTENSION
-EXTERNAL HB_PVALUE
-#endif
+EXTERNAL __PVALUE
 //
 //symbols from file: vm\harbinit.prg
 //
diff --git a/harbour/makefile.bc b/harbour/makefile.bc
index 11abf7664f..107d2f54f5 100644
--- a/harbour/makefile.bc
+++ b/harbour/makefile.bc
@@ -460,6 +460,7 @@ VM_LIB_OBJS = \
    $(OBJ_DIR)\codebloc.obj \
    $(OBJ_DIR)\debug.obj \
    $(OBJ_DIR)\dynsym.obj \
+   $(OBJ_DIR)\estack.obj \
    $(OBJ_DIR)\eval.obj \
    $(OBJ_DIR)\extend.obj \
    $(OBJ_DIR)\fm.obj \
@@ -613,7 +614,7 @@ HBMAKE_EXE_OBJS = \
    $(OBJ_DIR)\pickarry.obj \
    $(OBJ_DIR)\pickfile.obj \
    $(OBJ_DIR)\prb_stak.obj \
-   $(OBJ_DIR)\radios.obj 
+   $(OBJ_DIR)\radios.obj
 
 #
 # Our default target
@@ -637,7 +638,7 @@ all: \
    $(HBPP_EXE) \
    $(HBTEST_EXE) \
    $(HBDOC_EXE) \
-   $(HBMAKE_EXE) 
+   $(HBMAKE_EXE)
 #
 # Library dependencies and build rules
 #
@@ -945,6 +946,10 @@ $(OBJ_DIR)\eval.obj : $(VM_DIR)\eval.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(VM_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\estack.obj : $(VM_DIR)\estack.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(VM_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\extend.obj : $(VM_DIR)\extend.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(VM_LIB) $(ARFLAGS) -+$@,,