diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8a6bedef87..ccafdb28a1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-17 21:33 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk/hbmk2.prg
+    + Made HB_ARCHITECTURE and HB_COMPILER case-insensitive.
+      Notice however that other parts of Harbour (notably the
+      GNU-make system) will only accept them in lowercase, so
+      that's the recommended way to setup these values.
+    * One error message made more informative.
+
 2009-02-17 20:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk/hbmk2.prg
     + HB_COMPILER now automatically set to gcc for Linux.
diff --git a/harbour/utils/hbmk/hbmk2.prg b/harbour/utils/hbmk/hbmk2.prg
index ce23a8d44a..c02f1472dc 100644
--- a/harbour/utils/hbmk/hbmk2.prg
+++ b/harbour/utils/hbmk/hbmk2.prg
@@ -217,7 +217,7 @@ FUNCTION Main( ... )
 
    /* Autodetect architecture */
 
-   t_cARCH := GetEnv( "HB_ARCHITECTURE" )
+   t_cARCH := Lower( GetEnv( "HB_ARCHITECTURE" ) )
    IF Empty( GetEnv( "HB_ARCHITECTURE" ) )
 #if defined( __PLATFORM__BSD )
       t_cARCH := "bsd"
@@ -281,14 +281,14 @@ FUNCTION Main( ... )
       cBin_CompPRG := "harbour.exe"
       s_aLIBHBGT := { "gtwin", "gtwvt", "gtgui" }
    OTHERWISE
-      OutErr( "hbmk: Error: HB_ARCHITECTURE value unknown." + hb_osNewLine() )
+      OutErr( "hbmk: Error: HB_ARCHITECTURE value unknown: " + t_cARCH + hb_osNewLine() )
       PauseForKey()
       RETURN 1
    ENDCASE
 
    /* Autodetect compiler */
 
-   t_cCOMP := GetEnv( "HB_COMPILER" )
+   t_cCOMP := Lower( GetEnv( "HB_COMPILER" ) )
    IF Empty( GetEnv( "HB_COMPILER" ) )
       IF Len( aCOMPSUP ) == 1
          t_cCOMP := aCOMPSUP[ 1 ]