diff --git a/ChangeLog.txt b/ChangeLog.txt
index 41df24a6b6..077b1d68aa 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,10 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2015-03-09 19:16 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * contrib/hbtip/smtpcli.prg
+    ! consume whole EHLO output after STARTTLS
+
 2015-03-09 18:33 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbtip/smtpcli.prg
     ! added missing space after AUTH PLAIN
diff --git a/contrib/hbtip/smtpcli.prg b/contrib/hbtip/smtpcli.prg
index ddba8da6fe..447a72f399 100644
--- a/contrib/hbtip/smtpcli.prg
+++ b/contrib/hbtip/smtpcli.prg
@@ -169,7 +169,7 @@ METHOD StartTLS() CLASS TIPClientSMTP
       ::EnableSSL( .T. )
       ActivateSSL( Self )
       ::inetSendAll( ::SocketCon, "EHLO " + iif( Empty( ::cClientHost ), "TIPClientSMTP", ::cClientHost ) + ::cCRLF )
-      RETURN ::GetOk()
+      RETURN ::DetectSecurity()
    ENDIF
 
    RETURN .F.