diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3f7065634d..0c196d36f9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-05 00:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + -width=0 now means unlimited width.
+
+  * contrib/makefile.hbs
+  * contrib/hbide/ideprojmanager.prg
+    * Changed to use -width=0.
+
 2010-07-05 00:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/common/hbver.c
   * src/rtl/Makefile    [t]
diff --git a/harbour/contrib/hbide/ideprojmanager.prg b/harbour/contrib/hbide/ideprojmanager.prg
index 6d439d9baf..44f1cf53d6 100644
--- a/harbour/contrib/hbide/ideprojmanager.prg
+++ b/harbour/contrib/hbide/ideprojmanager.prg
@@ -1263,7 +1263,7 @@ METHOD IdeProjManager:buildSource( lExecutable )
    aadd( aHbp, "-trace"     )
    aadd( aHbp, "-info"      )
    aadd( aHbp, "-lang=en"   )
-   aadd( aHbp, "-width=512" )
+   aadd( aHbp, "-width=0"   )
    aadd( aHbp, "-rebuild"   )
    IF lExecutable
       aadd( aHbp, "-hbexe"  )
diff --git a/harbour/contrib/makefile.hbs b/harbour/contrib/makefile.hbs
index ac982b21d2..5722c79429 100644
--- a/harbour/contrib/makefile.hbs
+++ b/harbour/contrib/makefile.hbs
@@ -298,7 +298,7 @@ STATIC FUNCTION call_hbmk2( cProject, cTargetDir, cOptionsPre, cOptionsPost )
    hb_FNameSplit( cProject, @cDir, @cName )
 
    nErrorLevel := mk_hb_processRun( PathSepToSelf( GetEnv( "HB_HOST_BIN_DIR" ) ) + _PS_ + "hbmk2" +;
-                                    " -quiet -lang=en -width=1000 -q0" + cOptionsPre +;
+                                    " -quiet -lang=en -width=0 -q0" + cOptionsPre +;
                                     " " + cProject +;
                                     cOptionsPost +;
                                     " -workdir=" + cTargetDir + "/${hb_work}/" + cName + "${hb_workdynsub}" +;
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index d037b36084..d3442397e8 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -944,6 +944,8 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          tmp := Val( SubStr( cParam, 8 ) )
          IF tmp > 40
             hbmk[ _HBMK_nMaxCol ] := tmp
+         ELSEIF tmp == 0
+            hbmk[ _HBMK_nMaxCol ] := 65535
          ENDIF
 
       CASE cParamL             == "-hbrun"     ; lSkipBuild := .T. ; hbmk[ _HBMK_lRUN ] := .T.
@@ -10039,7 +10041,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       { "-comp[iler]=<comp>" , I_( "select C compiler.\nSpecial value:\n - bld: use original build settings (default on *nix)" ) },;
       { "-build=<name>"      , I_( "use a specific build name" ) },;
       { "-lang=<lang>"       , I_( "override default language. Similar to HB_LANG envvar." ) },;
-      { "-width=<n>"         , I_( "set output width to <n> characters." ) },;
+      { "-width=<n>"         , I_( "set output width to <n> characters (0=unlimited)." ) },;
       { "--version"          , I_( "display version header only" ) } }
 
    LOCAL aText_Notes := {;