diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6d132e127c..d78028de31 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,11 @@
    For example:
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
+  * source/common/hbstr.c
+    ! Fix bug in hb_strAt when the source string matches more than one
+      character (but less than all) in the search string. As reported
+      by Sergej Linnik, "22345" $ "012223456789" was failing, but it
+      now succeeds. Note: This also affects compiler optimizations,
       so be sure to rebuild the compiler before testing.
 
 2002-02-26 15:40 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
diff --git a/harbour/doc/dirstruc.txt b/harbour/doc/dirstruc.txt
index 02d54e96cc..6f0f6c1291 100644
--- a/harbour/doc/dirstruc.txt
+++ b/harbour/doc/dirstruc.txt
@@ -46,6 +46,10 @@ in order to remove empty directories)
 |   |   |
 |   |   +---test       - Test programs.
 |   |
+|   +---delphi         - Integration with Borland Delphi.
+|   |   |
+|   |   +---hbdll      - Accessing Harbour DLL from Delphi.
+|   |
 |   +---directx        - DirectDraw implementation for Windows.
 |   |   |
 |   |   +---lib        -