diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b44a495ab0..dc2b6a5a43 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-20 15:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+   * Makefile
+   * bin/postinst.bat
+   + bin/postinst.cmd
+     + Added postinst for OS/2.
+
+   * utils/hbmk2/hbmk2.prg
+     * Minor in comment.
+
 2009-02-20 15:13 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     * Removed -q0 default Harbour option.
diff --git a/harbour/Makefile b/harbour/Makefile
index 820cb5e1bf..32a4cf72a8 100644
--- a/harbour/Makefile
+++ b/harbour/Makefile
@@ -39,6 +39,10 @@ HB_POSTINST = $(subst /,\,$(TOP)$(ROOT)bin/postinst.bat) $(HB_POSTINSTPARAM)
 else
 ifeq ($(HB_ARCHITECTURE),win)
 HB_POSTINST = $(subst /,\,$(TOP)$(ROOT)bin/postinst.bat) $(HB_POSTINSTPARAM)
+else
+ifeq ($(HB_ARCHITECTURE),os2)
+HB_POSTINST = $(subst /,\,$(TOP)$(ROOT)bin/postinst.cmd) $(HB_POSTINSTPARAM)
+endif
 endif
 endif
 endif
diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat
index bf58864327..95e06942c6 100644
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -5,6 +5,7 @@
 @echo off
 
 rem ---------------------------------------------------------------
+rem Copyright 2009 Viktor Szakats (viktor.szakats@syenar.hu)
 rem Copyright 2003 Przemyslaw Czerpak (druzus / at / priv.onet.pl)
 rem simple script run after Harbour make install to finish install
 rem process
@@ -34,15 +35,5 @@ echo @hbmk2.exe -hblnk %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9> %HB_BIN_INSTALL%\hbl
 goto end
 
 
-:inst_os2
-rem OS/2 post install part
-
-echo @hbmk2.exe -hbcc  %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9> %HB_BIN_INSTALL%\hbcc.cmd
-echo @hbmk2.exe -hbcmp %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9> %HB_BIN_INSTALL%\hbcmp.cmd
-echo @hbmk2.exe -hblnk %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9> %HB_BIN_INSTALL%\hblnk.cmd
-
-goto end
-
-
 :inst_
 :end
diff --git a/harbour/bin/postinst.cmd b/harbour/bin/postinst.cmd
new file mode 100644
index 0000000000..e788b59eb8
--- /dev/null
+++ b/harbour/bin/postinst.cmd
@@ -0,0 +1,29 @@
+@rem
+@rem $Id$
+@rem
+
+@echo off
+
+rem ---------------------------------------------------------------
+rem Copyright 2009 Viktor Szakats (viktor.szakats@syenar.hu)
+rem Copyright 2003 Przemyslaw Czerpak (druzus / at / priv.onet.pl)
+rem simple script run after Harbour make install to finish install
+rem process
+rem
+rem See doc/license.txt for licensing terms.
+rem ---------------------------------------------------------------
+
+goto inst_%HB_ARCHITECTURE%
+
+:inst_os2
+rem OS/2 post install part
+
+echo @hbmk2.exe -hbcc  %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9> %HB_BIN_INSTALL%\hbcc.cmd
+echo @hbmk2.exe -hbcmp %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9> %HB_BIN_INSTALL%\hbcmp.cmd
+echo @hbmk2.exe -hblnk %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9> %HB_BIN_INSTALL%\hblnk.cmd
+
+goto end
+
+
+:inst_
+:end
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 0f1cc10ade..3ff395ae96 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -66,7 +66,7 @@
 /* TODO: msvc/bcc32: Use separate link phase. This allows incremental links. */
 /* TODO: Support for more compilers/platforms. */
 /* TODO: Cleanup on variable names. */
-/* TODO: remove -n? from default harbour switches */
+/* TODO: remove -n from default harbour switches? */
 /* TODO: MAIN() detection or override? Someone who's familiar with this issue pls help. */
 
 #if ! defined( HBMK_NO_GTCGI )