diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fb1784c987..2dc4929e03 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,21 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-05 21:24 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * contrib/hbbtree/tests/test.hbm
+  * contrib/examples/guestbk/guestbk.hbm
+  * contrib/examples/pe/pe.hbm
+  * contrib/examples/dbu/dbu.hbm
+  * contrib/examples/terminal/terminal.hbp
+  * contrib/examples/hscript/hscript.hbm
+  * contrib/examples/uhttpd/modules/allmod.hbm
+  * contrib/examples/rl/rl.hbm
+  * utils/hbdoc/hbdoc.hbm
+  * utils/hbmk2/hbmk2.hbm
+  * utils/hbtest/hbtest.hbm
+  * utils/hbrun/hbrun.hbm
+    - Removed -n switches no longer necessary.
+
 2009-03-05 21:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * include/hbextern.ch
     + Added HB_SETENV()
@@ -516,7 +531,7 @@
   * utils/hbmk2/hbmk2.prg
     + Added -n2 Harbour switch as default.
     ; TODO: If this works out well, we can remove explicit
-            -n switches from .hbm files.
+            -n switches from .hbm files. [DONE]
 
   * config/win/bcc.cf
     + Suppressing some OS commands to not pollute output.
@@ -2064,10 +2079,10 @@
 
   * utils/hbmk2/hbmk2.prg
     - Removed -n from default Harbour switches.
-    ; TODO: Add prgflags=-n to all .hbp files.
+    ; TODO: Add prgflags=-n to all .hbp files. [NOT NEEDED ANYMORE]
     ; TODO: Add -n to all .hbm files. [DONE]
     ; TODO: Add .hbp file to dirs where there are .prgs
-            needing -n flag.
+            needing -n flag. [NOT NEEDED ANYMORE]
 
   + bin/hb-mkdll.bat
     + Added .dll creation for GNU-make. Not yet enabled,
diff --git a/harbour/contrib/examples/dbu/dbu.hbm b/harbour/contrib/examples/dbu/dbu.hbm
index f51f018d8e..fc30b60c30 100644
--- a/harbour/contrib/examples/dbu/dbu.hbm
+++ b/harbour/contrib/examples/dbu/dbu.hbm
@@ -2,7 +2,6 @@
 # $Id$
 #
 
--n
 DBU.PRG
 DBUCOPY.PRG
 DBUEDIT.PRG
diff --git a/harbour/contrib/examples/guestbk/guestbk.hbm b/harbour/contrib/examples/guestbk/guestbk.hbm
index ed64a1e84f..2d3586cd1e 100644
--- a/harbour/contrib/examples/guestbk/guestbk.hbm
+++ b/harbour/contrib/examples/guestbk/guestbk.hbm
@@ -2,4 +2,4 @@
 # $Id$
 #
 
--n guestbk.prg inifiles.prg testcgi.prg
+guestbk.prg inifiles.prg testcgi.prg
diff --git a/harbour/contrib/examples/hscript/hscript.hbm b/harbour/contrib/examples/hscript/hscript.hbm
index 67c360464d..fbe7df444d 100644
--- a/harbour/contrib/examples/hscript/hscript.hbm
+++ b/harbour/contrib/examples/hscript/hscript.hbm
@@ -2,4 +2,4 @@
 # $Id$
 #
 
--n hscript.prg -lhbnf
+hscript.prg -lhbnf
diff --git a/harbour/contrib/examples/pe/pe.hbm b/harbour/contrib/examples/pe/pe.hbm
index e92e5f6582..02c52e7115 100644
--- a/harbour/contrib/examples/pe/pe.hbm
+++ b/harbour/contrib/examples/pe/pe.hbm
@@ -2,4 +2,4 @@
 # $Id$
 #
 
--n pe.prg editorhi.prg editorlo.c
+pe.prg editorhi.prg editorlo.c
diff --git a/harbour/contrib/examples/rl/rl.hbm b/harbour/contrib/examples/rl/rl.hbm
index fb4410bd88..8b59b44088 100644
--- a/harbour/contrib/examples/rl/rl.hbm
+++ b/harbour/contrib/examples/rl/rl.hbm
@@ -2,7 +2,6 @@
 # $Id$
 #
 
--n
 RLBACK.PRG
 RLDIALG.PRG
 RLFRONT.PRG
diff --git a/harbour/contrib/examples/terminal/terminal.hbp b/harbour/contrib/examples/terminal/terminal.hbp
index c4e8a9a26a..262e9a8d83 100644
--- a/harbour/contrib/examples/terminal/terminal.hbp
+++ b/harbour/contrib/examples/terminal/terminal.hbp
@@ -3,6 +3,5 @@
 #
 
 {win}libs=gtwvg hbwin xhb comdlg32 comctl32 shell32 ole32 oleaut32
-prgflags=-n
 mt=yes
 gui=yes
diff --git a/harbour/contrib/examples/uhttpd/modules/allmod.hbm b/harbour/contrib/examples/uhttpd/modules/allmod.hbm
index ec5753369f..51b8b46d70 100644
--- a/harbour/contrib/examples/uhttpd/modules/allmod.hbm
+++ b/harbour/contrib/examples/uhttpd/modules/allmod.hbm
@@ -2,7 +2,7 @@
 # $Id$
 #
 
--n -gh -w3
+-gh -w3
 -o..\home\cgi-bin\
 cookie.prg
 info.prg
diff --git a/harbour/contrib/hbbtree/tests/test.hbm b/harbour/contrib/hbbtree/tests/test.hbm
index 38e214ba38..7e771d2e79 100644
--- a/harbour/contrib/hbbtree/tests/test.hbm
+++ b/harbour/contrib/hbbtree/tests/test.hbm
@@ -2,4 +2,4 @@
 # $Id$
 #
 
--n test.prg ttest.prg ctest.c
+test.prg ttest.prg ctest.c
diff --git a/harbour/utils/hbdoc/hbdoc.hbm b/harbour/utils/hbdoc/hbdoc.hbm
index f6d1d6d976..eb6ae52fcb 100644
--- a/harbour/utils/hbdoc/hbdoc.hbm
+++ b/harbour/utils/hbdoc/hbdoc.hbm
@@ -2,7 +2,6 @@
 # $Id$
 #
 
--n
 hbdoc.prg
 ft_funcs.prg
 genasc.prg
diff --git a/harbour/utils/hbmk2/hbmk2.hbm b/harbour/utils/hbmk2/hbmk2.hbm
index bc06156bb9..01480006a8 100644
--- a/harbour/utils/hbmk2/hbmk2.hbm
+++ b/harbour/utils/hbmk2/hbmk2.hbm
@@ -2,4 +2,4 @@
 # $Id$
 #
 
--n hbmk2.prg
+hbmk2.prg
diff --git a/harbour/utils/hbrun/hbrun.hbm b/harbour/utils/hbrun/hbrun.hbm
index 08d397577e..32a14c24d9 100644
--- a/harbour/utils/hbrun/hbrun.hbm
+++ b/harbour/utils/hbrun/hbrun.hbm
@@ -2,5 +2,4 @@
 # $Id$
 #
 
--n
 hbrun.prg
diff --git a/harbour/utils/hbtest/hbtest.hbm b/harbour/utils/hbtest/hbtest.hbm
index c3eb6e4d26..f27377d8e5 100644
--- a/harbour/utils/hbtest/hbtest.hbm
+++ b/harbour/utils/hbtest/hbtest.hbm
@@ -2,7 +2,6 @@
 # $Id$
 #
 
--n
 hbtest.prg
 rt_array.prg
 rt_date.prg