diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 526e7c74b1..2bb1485e31 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-06-05 20:22 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * harbour/doc/linux1st.txt
+     + Added info about required Ubuntu packages.
+       (Thanks Przemek)
+
+   * harbour/utils/hbtest/rt_hvma.prg
+   * harbour/utils/hbtest/rt_str.prg
+     + Added two more tests for "" $ "" / At( "", "" ) 
+       combinations.
+
 2007-06-05 10:53 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   - harbour/contrib/hbzlib/Makefile.mingw
     - removed not necessary file
diff --git a/harbour/doc/linux1st.txt b/harbour/doc/linux1st.txt
index a089407480..14251462a7 100644
--- a/harbour/doc/linux1st.txt
+++ b/harbour/doc/linux1st.txt
@@ -5,6 +5,24 @@
                           Linux primer
                           ============
 
+Ubuntu distro
+-------------
+
+Packages needed to cleanly build Harbour:
+(Tested with Ubuntu 7.04 Server)
+
+For GTCRS terminal lib:
+sudo apt-get install libncurses-dev
+
+For GTSLN terminal lib:
+sudo apt-get install libslang2-dev
+
+For GTXWC terminal lib:
+sudo apt-get install libx11-dev
+
+For Contrib/ODBC lib:
+sudo apt-get install unixodbc-dev
+
 DEBIAN distro
 -------------
 
diff --git a/harbour/utils/hbtest/rt_hvma.prg b/harbour/utils/hbtest/rt_hvma.prg
index 67579e0a22..a9281bd5a3 100644
--- a/harbour/utils/hbtest/rt_hvma.prg
+++ b/harbour/utils/hbtest/rt_hvma.prg
@@ -219,7 +219,9 @@ FUNCTION Main_HVMA()
    TEST_LINE( ( "X" ) $ Chr(0) + "X"          , .T. )
    TEST_LINE( scString $ Chr(0) + scString    , .T. )
 
+   TEST_LINE( scStringE $ scStringE           , .F. )
    TEST_LINE( scStringE $ "bcde"              , .F. )
+   TEST_LINE( "" $ ""                         , .T. ) /* Bug in CA-Cl*ppers compiler optimizer. It should return .F. */
    TEST_LINE( "" $ "bcde"                     , .T. ) /* Bug in CA-Cl*ppers compiler optimizer. It should return .F. */
    TEST_LINE( "d" $ "bcde"                    , .T. )
    TEST_LINE( "D" $ "BCDE"                    , .T. )
diff --git a/harbour/utils/hbtest/rt_str.prg b/harbour/utils/hbtest/rt_str.prg
index 01dc846f91..b5df3fd87a 100644
--- a/harbour/utils/hbtest/rt_str.prg
+++ b/harbour/utils/hbtest/rt_str.prg
@@ -427,6 +427,7 @@ FUNCTION Main_STR()
    TEST_LINE( At(100, "")                     , "E BASE 1108 Argument error AT A:2:N:100;C: F:S"   )
    TEST_LINE( At("", "")                      , 1                ) /* Bug in CA-Cl*ppers compiler optimizer, it should return 0 */
    TEST_LINE( At("", "ABCDEF")                , 1                ) /* Bug in CA-Cl*ppers compiler optimizer, it should return 0 */
+   TEST_LINE( At(scStringE, scStringE)        , 0                )
    TEST_LINE( At(scStringE, "ABCDEF")         , 0                )
    TEST_LINE( At("ABCDEF", "")                , 0                )
    TEST_LINE( At("AB", "AB")                  , 1                )