diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f2699bf4cb..2540cb18b7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-05-24 14:35 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbtip/ftpcli.prg
+    ! fixed item deletion inside FOR EACH loop (regression from
+      5 years ago). Suggested by Klas Engwall.
+
 2012-05-24 13:09 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/config/postinst.hb
     ! remove old links before hb_FLinkSym() is called.
@@ -35,9 +40,9 @@
   * contrib/hbide/idebrowse.prg
   * contrib/hbide/idedocks.prg
   * contrib/hbide/idemisc.prg
-    ! Streamlined: HBQToolbar class adding more methods and refining 
-      others. All toolbars in hbIDE except the one, are now based 
-      on HBQToolbar() class and probably it becomes candidate to be 
+    ! Streamlined: HBQToolbar class adding more methods and refining
+      others. All toolbars in hbIDE except the one, are now based
+      on HBQToolbar() class and probably it becomes candidate to be
       transferred to hbQT after a bit of polishing.
 
 2012-05-23 14:24 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
@@ -61,7 +66,7 @@
   * contrib/hbxbp/xbpfiledialog.prg
     * Fixed: how :connect()/:disconnect() was applied.
              NOTE: until a :disconnect() is performed on an object
-                   which has an actice :connect(), it never goes 
+                   which has an actice :connect(), it never goes
                    out-of-scope.
 
 2012-05-22 18:42 UTC+0200 Viktor Szakats (harbour syenar.net)
diff --git a/harbour/contrib/hbtip/ftpcli.prg b/harbour/contrib/hbtip/ftpcli.prg
index bf4f4e617a..cad71f65f4 100644
--- a/harbour/contrib/hbtip/ftpcli.prg
+++ b/harbour/contrib/hbtip/ftpcli.prg
@@ -583,7 +583,7 @@ METHOD MGET( cSpec, cLocalPath ) CLASS tIPClientFTP
 
    IF ! Empty( cStr )
       FOR EACH cFile IN hb_ATokens( StrTran( cStr, Chr( 13 ) ), Chr( 10 ) )
-         IF ! Empty( cFile ) //PM:09-08-2007 Needed because of the new hb_ATokens()
+         IF ! Empty( cFile )
             ::downloadfile( cLocalPath + RTrim( cFile ), RTrim( cFile ) )
          ENDIF
       NEXT
@@ -761,9 +761,9 @@ METHOD listFiles( cFileSpec ) CLASS tIPClientFTP
 
    aList := hb_ATokens( StrTran( cList, Chr( 13 ) ), Chr( 10 ) )
 
-   FOR EACH cEntry IN aList
+   FOR EACH cEntry IN aList DESCEND
 
-      IF Empty( cEntry ) //PM:09-08-2007 Needed because of the new hb_ATokens()
+      IF Empty( cEntry )
 
          hb_ADel( aList, cEntry:__enumIndex(), .T. )