diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a61f4a96bb..2b9da83198 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,29 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-20 11:47 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/config/bsd/gcc.mk
+  * harbour/config/darwin/gcc.mk
+  * harbour/config/hpux/gcc.mk
+  * harbour/config/dos/djgpp.mk
+  * harbour/config/win/mingw.mk
+  * harbour/config/linux/gcc.mk
+  * harbour/config/linux/icc.mk
+  * harbour/config/linux/sunpro.mk
+  * harbour/config/os2/gcc.mk
+  * harbour/config/sunos/gcc.mk
+  * harbour/config/sunos/sunpro.mk
+    ! replaced wrongly used 'findstring' functions with 'filter' functions.
+      Now findstring is used only in places where we are looking for
+      substrings not whole words.
+
+  * harbour/source/rdd/wacore.c
+    ! fixed typo in comment (by Phil Krylov borrowed from xHarbour)
+
+  * harbour/ChangeLog
+    ! fixed my typo in Latin translation of Phil Krylov family
+      name - sorry Phil.
+
 2009-08-20 11:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
   * config/wce/msvcarm.mk
@@ -70931,7 +70954,7 @@
     * use hb_fsNameConv() instead of hb_fileNameConv()
 
   * harbour/source/debug/dbgentry.c
-    + added modifications by Phil Krylow borowed from xHarbour for
+    + added modifications by Phil Krylov borowed from xHarbour for
       supporting :: in command line expressions
 
   * harbour/source/rdd/dbfntx/dbfntx1.c
@@ -73526,7 +73549,7 @@
 2007-05-28 09:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/make_xmingw.sh
   * harbour/source/pp/Makefile
-    * recent xHarbour fixes for MinGW Linux->W32 cross build by Phil Krylow
+    * recent xHarbour fixes for MinGW Linux->W32 cross build by Phil Krylov
       with small modifications
 
   * harbour/config/rules.cf
diff --git a/harbour/config/bsd/gcc.mk b/harbour/config/bsd/gcc.mk
index 202b45f716..a6bee3b1fb 100644
--- a/harbour/config/bsd/gcc.mk
+++ b/harbour/config/bsd/gcc.mk
@@ -38,22 +38,22 @@ LD_OUT := -o
 LIBPATHS := -L$(LIB_DIR)
 LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
 
-ifneq ($(findstring hbrtl, $(LIBS)),)
+ifneq ($(filter hbrtl, $(LIBS)),)
    # Add the specified GT driver library
    ifeq ($(HB_CRS_LIB),)
       HB_CRS_LIB := ncurses
    endif
-   ifneq ($(findstring gtcrs, $(LIBS)),)
+   ifneq ($(filter gtcrs, $(LIBS)),)
       LDLIBS += -l$(HB_CRS_LIB)
    endif
-   ifneq ($(findstring gtsln, $(LIBS)),)
+   ifneq ($(filter gtsln, $(LIBS)),)
       LDLIBS += -lslang
       # In BSD, slang still needs curses :(
-      ifeq ($(findstring gtcrs, $(LIBS)),)
+      ifeq ($(filter gtcrs, $(LIBS)),)
          LDLIBS += -l$(HB_CRS_LIB)
       endif
    endif
-   ifneq ($(findstring gtxwc, $(LIBS)),)
+   ifneq ($(filter gtxwc, $(LIBS)),)
       LDLIBS += -lX11
      #LIBPATHS += -L/usr/X11R6/lib64
       LIBPATHS += -L/usr/X11R6/lib
diff --git a/harbour/config/darwin/gcc.mk b/harbour/config/darwin/gcc.mk
index c276bf9222..807e82f07d 100644
--- a/harbour/config/darwin/gcc.mk
+++ b/harbour/config/darwin/gcc.mk
@@ -51,22 +51,22 @@ LD_OUT := -o$(subst x,x, )
 LIBPATHS := -L$(LIB_DIR)
 LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
 
-ifneq ($(findstring hbrtl, $(LIBS)),)
+ifneq ($(filter hbrtl, $(LIBS)),)
    # Add the specified GT driver library
    ifeq ($(HB_CRS_LIB),)
       HB_CRS_LIB := ncurses
    endif
-   ifneq ($(findstring gtcrs, $(LIBS)),)
+   ifneq ($(filter gtcrs, $(LIBS)),)
       LDLIBS += -l$(HB_CRS_LIB)
    endif
-   ifneq ($(findstring gtsln, $(LIBS)),)
+   ifneq ($(filter gtsln, $(LIBS)),)
       LDLIBS += -lslang
       # In BSD, slang still needs curses :(
-      ifeq ($(findstring gtcrs, $(LIBS)),)
+      ifeq ($(filter gtcrs, $(LIBS)),)
          LDLIBS += -l$(HB_CRS_LIB)
       endif
    endif
-   ifneq ($(findstring gtxwc, $(LIBS)),)
+   ifneq ($(filter gtxwc, $(LIBS)),)
       LDLIBS += -lX11
      #LIBPATHS += -L/usr/X11R6/lib64
       LIBPATHS += -L/usr/X11R6/lib
diff --git a/harbour/config/dos/djgpp.mk b/harbour/config/dos/djgpp.mk
index 2c59aa41a7..9ab444606c 100644
--- a/harbour/config/dos/djgpp.mk
+++ b/harbour/config/dos/djgpp.mk
@@ -39,12 +39,12 @@ LIBPATHS := -L$(LIB_DIR)
 
 LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
 
-ifneq ($(findstring hbrtl, $(LIBS)),)
+ifneq ($(filter hbrtl, $(LIBS)),)
    # Add the specified GT driver library
    ifeq ($(HB_CRS_LIB),)
       HB_CRS_LIB := pdcurses
    endif
-   ifneq ($(findstring gtcrs, $(LIBS)),)
+   ifneq ($(filter gtcrs, $(LIBS)),)
       LDLIBS += -l$(HB_CRS_LIB)
    endif
 endif
diff --git a/harbour/config/hpux/gcc.mk b/harbour/config/hpux/gcc.mk
index 0abec748e5..ebc78f3815 100644
--- a/harbour/config/hpux/gcc.mk
+++ b/harbour/config/hpux/gcc.mk
@@ -44,18 +44,18 @@ LD_OUT := -o
 LIBPATHS := -L$(LIB_DIR)
 LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
 
-ifneq ($(findstring hbrtl, $(LIBS)),)
+ifneq ($(filter hbrtl, $(LIBS)),)
    # Add the specified GT driver library
-   ifneq ($(findstring gtcrs, $(LIBS)),)
+   ifneq ($(filter gtcrs, $(LIBS)),)
       ifeq ($(HB_CRS_LIB),)
          HB_CRS_LIB := ncurses
       endif
       LDLIBS += -l$(HB_CRS_LIB)
    endif
-   ifneq ($(findstring gtsln, $(LIBS)),)
+   ifneq ($(filter gtsln, $(LIBS)),)
       LDLIBS += -lslang
    endif
-   ifneq ($(findstring gtxwc, $(LIBS)),)
+   ifneq ($(filter gtxwc, $(LIBS)),)
       LDLIBS += -lX11
      #LIBPATHS += -L/usr/X11R6/lib64
       LIBPATHS += -L/usr/X11R6/lib
diff --git a/harbour/config/linux/gcc.mk b/harbour/config/linux/gcc.mk
index 21831fc760..3f4516f8c0 100644
--- a/harbour/config/linux/gcc.mk
+++ b/harbour/config/linux/gcc.mk
@@ -42,18 +42,18 @@ LD_OUT := -o
 LIBPATHS := -L$(LIB_DIR)
 LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
 
-ifneq ($(findstring hbrtl, $(LIBS)),)
+ifneq ($(filter hbrtl, $(LIBS)),)
    # Add the specified GT driver library
-   ifneq ($(findstring gtcrs, $(LIBS)),)
+   ifneq ($(filter gtcrs, $(LIBS)),)
       ifeq ($(HB_CRS_LIB),)
          HB_CRS_LIB := ncurses
       endif
       LDLIBS += -l$(HB_CRS_LIB)
    endif
-   ifneq ($(findstring gtsln, $(LIBS)),)
+   ifneq ($(filter gtsln, $(LIBS)),)
       LDLIBS += -lslang
    endif
-   ifneq ($(findstring gtxwc, $(LIBS)),)
+   ifneq ($(filter gtxwc, $(LIBS)),)
       LDLIBS += -lX11
      #LIBPATHS += -L/usr/X11R6/lib64
       LIBPATHS += -L/usr/X11R6/lib
diff --git a/harbour/config/linux/icc.mk b/harbour/config/linux/icc.mk
index f15ebcd59f..ff18d259c8 100644
--- a/harbour/config/linux/icc.mk
+++ b/harbour/config/linux/icc.mk
@@ -47,18 +47,18 @@ LD_OUT := -o
 LIBPATHS := -L$(LIB_DIR)
 LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
 
-ifneq ($(findstring hbrtl, $(LIBS)),)
+ifneq ($(filter hbrtl, $(LIBS)),)
    # Add the specified GT driver library
-   ifneq ($(findstring gtcrs, $(LIBS)),)
+   ifneq ($(filter gtcrs, $(LIBS)),)
       ifeq ($(HB_CRS_LIB),)
          HB_CRS_LIB := ncurses
       endif
       LDLIBS += -l$(HB_CRS_LIB)
    endif
-   ifneq ($(findstring gtsln, $(LIBS)),)
+   ifneq ($(filter gtsln, $(LIBS)),)
       LDLIBS += -lslang
    endif
-   ifneq ($(findstring gtxwc, $(LIBS)),)
+   ifneq ($(filter gtxwc, $(LIBS)),)
       LDLIBS += -lX11
      #LIBPATHS += -L/usr/X11R6/lib64
       LIBPATHS += -L/usr/X11R6/lib
diff --git a/harbour/config/linux/sunpro.mk b/harbour/config/linux/sunpro.mk
index 199ecba330..2936f847b7 100644
--- a/harbour/config/linux/sunpro.mk
+++ b/harbour/config/linux/sunpro.mk
@@ -65,18 +65,18 @@ LD_OUT := -o$(subst x,x, )
 LIBPATHS := -L$(LIB_DIR)
 LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
 
-ifneq ($(findstring hbrtl, $(LIBS)),)
+ifneq ($(filter hbrtl, $(LIBS)),)
    # Add the specified GT driver library
-   ifneq ($(findstring gtcrs, $(LIBS)),)
+   ifneq ($(filter gtcrs, $(LIBS)),)
       ifeq ($(HB_CRS_LIB),)
          HB_CRS_LIB := ncurses
       endif
       LDLIBS += -l$(HB_CRS_LIB)
    endif
-   ifneq ($(findstring gtsln, $(LIBS)),)
+   ifneq ($(filter gtsln, $(LIBS)),)
       LDLIBS += -lslang
    endif
-   ifneq ($(findstring gtxwc, $(LIBS)),)
+   ifneq ($(filter gtxwc, $(LIBS)),)
       LDLIBS += -lX11
       LIBPATHS += -L/usr/X11R6/lib
    endif
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index a1a0df2397..2d8fdda28e 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -46,7 +46,7 @@ LIBPATHS := -L$(LIB_DIR)
 LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library
-ifneq ($(findstring hbrtl, $(LIBS)),)
+ifneq ($(filter hbrtl, $(LIBS)),)
    ifeq ($(C_MAIN),)
       ifeq ($(filter os2pm,$(HB_GT_LIB)),os2pm)
          # Special handling for PM mode
diff --git a/harbour/config/sunos/gcc.mk b/harbour/config/sunos/gcc.mk
index 5c645ef9be..02ff73236f 100644
--- a/harbour/config/sunos/gcc.mk
+++ b/harbour/config/sunos/gcc.mk
@@ -42,18 +42,18 @@ LD_OUT := -o
 LIBPATHS := -L$(LIB_DIR)
 LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
 
-ifneq ($(findstring hbrtl, $(LIBS)),)
+ifneq ($(filter hbrtl, $(LIBS)),)
    # Add the specified GT driver library
-   ifneq ($(findstring gtcrs, $(LIBS)),)
+   ifneq ($(filter gtcrs, $(LIBS)),)
       ifeq ($(HB_CRS_LIB),)
          HB_CRS_LIB := curses
       endif
       LDLIBS += -l$(HB_CRS_LIB)
    endif
-   ifneq ($(findstring gtsln, $(LIBS)),)
+   ifneq ($(filter gtsln, $(LIBS)),)
       LDLIBS += -lslang
    endif
-   ifneq ($(findstring gtxwc, $(LIBS)),)
+   ifneq ($(filter gtxwc, $(LIBS)),)
       LDLIBS += -lX11
      #LIBPATHS += -L/usr/X11R6/lib64
       LIBPATHS += -L/usr/X11R6/lib
diff --git a/harbour/config/sunos/sunpro.mk b/harbour/config/sunos/sunpro.mk
index 5dfd37e245..c68bba644c 100644
--- a/harbour/config/sunos/sunpro.mk
+++ b/harbour/config/sunos/sunpro.mk
@@ -71,18 +71,18 @@ LD_OUT := -o$(subst x,x, )
 LIBPATHS := -L$(LIB_DIR)
 LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
 
-ifneq ($(findstring hbrtl, $(LIBS)),)
+ifneq ($(filter hbrtl, $(LIBS)),)
    # Add the specified GT driver library
-   ifneq ($(findstring gtcrs, $(LIBS)),)
+   ifneq ($(filter gtcrs, $(LIBS)),)
       ifeq ($(HB_CRS_LIB),)
          HB_CRS_LIB := curses
       endif
       LDLIBS += -l$(HB_CRS_LIB)
    endif
-   ifneq ($(findstring gtsln, $(LIBS)),)
+   ifneq ($(filter gtsln, $(LIBS)),)
       LDLIBS += -lslang
    endif
-   ifneq ($(findstring gtxwc, $(LIBS)),)
+   ifneq ($(filter gtxwc, $(LIBS)),)
       LDLIBS += -lX11
       LIBPATHS += -L/usr/X11R6/lib
    endif
diff --git a/harbour/config/win/mingw.mk b/harbour/config/win/mingw.mk
index ddad4972b7..182664e16c 100644
--- a/harbour/config/win/mingw.mk
+++ b/harbour/config/win/mingw.mk
@@ -44,7 +44,7 @@ LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
 
 # Add the standard C main() entry
 ifeq ($(HB_MAIN),std)
-   ifeq ($(findstring hbvm,$(LIBS)),hbvm)
+   ifeq ($(filter hbrtl,$(LIBS)),hbrtl)
       LDLIBS += -lhbmainstd
    endif
 endif
diff --git a/harbour/source/rdd/wacore.c b/harbour/source/rdd/wacore.c
index bb7753e05f..1e377a6197 100644
--- a/harbour/source/rdd/wacore.c
+++ b/harbour/source/rdd/wacore.c
@@ -189,7 +189,7 @@ HB_ERRCODE hb_rddSelectFirstAvailable( void )
 }
 
 /*
- * Creare and insert the new WorkArea node
+ * Create and insert the new WorkArea node
  */
 USHORT hb_rddInsertAreaNode( const char *szDriver )
 {