diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4c24261921..991f03c1bd 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,7 +8,12 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
-2009-03-25 15:47 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+2009-03-26 15:54 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    + Added autodetection of embedded MinGW64 and MinGWCE
+      compilers.
+
+2009-03-26 15:47 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * doc/en/Makefile
   * doc/Makefile
   - doc/en
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 57e77f050c..a306a8ddcc 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -607,6 +607,22 @@ FUNCTION Main( ... )
                      t_cCCPATH := tmp
                   ENDIF
                ENDIF
+               IF Empty( t_cCCPATH )
+                  tmp := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingw64" + hb_osPathSeparator() + "bin"
+                  IF hb_FileExists( tmp + hb_osPathSeparator() + "x86_64-pc-mingw32-gcc.exe" )
+                     t_cCOMP := "mingw64"
+                     t_cCCPATH := tmp
+                     t_cCCPREFIX := "x86_64-pc-mingw32-"
+                  ENDIF
+               ENDIF
+               IF Empty( t_cCCPATH )
+                  tmp := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingwce" + hb_osPathSeparator() + "bin"
+                  IF hb_FileExists( tmp + hb_osPathSeparator() + "arm-wince-mingw32ce-gcc.exe" )
+                     t_cCOMP := "mingwce"
+                     t_cCCPATH := tmp
+                     t_cCCPREFIX := "arm-wince-mingw32ce-"
+                  ENDIF
+               ENDIF
             #endif
             IF Empty( t_cCOMP ) .AND. ! Empty( aCOMPDET )
                /* Look for this compiler first */