diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 17f576b876..834b570f7a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-25 10:30 UTC+0300 Alexander Kresin <alex at belacy.belgorod.su>
+  * utils/hbformat/hbformat.prg
+    ! Fixed SetOption() method.
+
 2009-05-25 10:11 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * doc/howtosvn.txt
     * Deleted sections dealing with sending commit e-mails.
diff --git a/harbour/utils/hbformat/hbformat.prg b/harbour/utils/hbformat/hbformat.prg
index 6fe0b33119..9182dcca78 100644
--- a/harbour/utils/hbformat/hbformat.prg
+++ b/harbour/utils/hbformat/hbformat.prg
@@ -828,7 +828,7 @@ METHOD SetOption( cLine, i, aIni ) CLASS CODEFORMAT
       IF __ObjHasMsg( Self, cToken1 )
          IF Empty( cToken2 )
             xRes := ""
-         ELSEIF IsDigit( cToken2 )
+         ELSEIF IsDigit( cToken2 ) .OR. ( Left( cToken2,1 ) == '-' .AND. IsDigit( Ltrim(Substr(cToken2,2)) ) )
             xRes := Val( cToken2 )
          ELSEIF Isalpha( cToken2 )
             IF ( cTemp := Upper( cToken2 ) ) == "ON" .OR. cTemp == "YES"