diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 307f1559ae..6a4b2b1d43 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-24 23:43 GMT -3 Luiz Rafael Culik <culik@sl.conex.net>
+   *utils/hbmake/hbmake.prg
+     * Reverted last change to hbmake, and put the file existence test on the correct place
+
 2001-06-24 11:15 UTC-0800 Ron Pinkas <ron@profit-master.com>
    * source/vm/arrays.c
      ! Fixed but in hb_arrayDel() which caused a GPF by accessing an item beyond the array end.
diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg
index d470ba7849..1919d841b8 100644
--- a/harbour/utils/hbmake/hbmake.prg
+++ b/harbour/utils/hbmake/hbmake.prg
@@ -139,7 +139,7 @@ If Pcount() == 0
    ? "          or use one macro per -D switch"
    Return NIL
 Endif
-If cFile == NIL .or. !file(cfile)
+If cFile == NIL 
    ? "File not Found"
    Return Nil
 Endif
@@ -285,7 +285,9 @@ if at("-E",allparam)>0
       Next
    Endif
 Endif
-
+if !file(cfile)
+   return nil
+endif
 parsemakfi( cFile )
 If lPrint
    PrintMacros()