diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a18628e9e7..6c730f2c3c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+
+2010-05-25 21:42 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * utils/hbmk2/examples/plug_moc.prg
+    ! Fixed to cover header file supplied with path like 
+        -pe=somefolder/someheader.h.
+
 2010-05-26 02:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/examples/plug_moc.prg
     ! Copy/paste typo in moc detection on some linux platforms.
diff --git a/harbour/utils/hbmk2/examples/plug_moc.prg b/harbour/utils/hbmk2/examples/plug_moc.prg
index f797a719a5..2f4720c1cd 100644
--- a/harbour/utils/hbmk2/examples/plug_moc.prg
+++ b/harbour/utils/hbmk2/examples/plug_moc.prg
@@ -21,7 +21,7 @@ FUNCTION hbmk2_plugin_moc( hbmk2 )
    LOCAL cCommand
    LOCAL cDst
    LOCAL nError
-   LOCAL tmp, tmp1, tmp2
+   LOCAL tmp, tmp1, tmp2, tmp3
 
    LOCAL lBuildIt
 
@@ -79,7 +79,9 @@ FUNCTION hbmk2_plugin_moc( hbmk2 )
 
          FOR EACH tmp IN aMOC
 
-            cDst := hbmk2_FNameDirExtSet( "moc_" + tmp, hbmk2[ "cWorkDir" ], ".cpp" )
+            hb_fNameSplit( tmp, , @tmp3 )
+
+            cDst := hbmk2_FNameDirExtSet( "moc_" + tmp3, hbmk2[ "cWorkDir" ], ".cpp" )
 
             IF hbmk2[ "lINC" ] .AND. ! hbmk2[ "lREBUILD" ]
                lBuildIt := ! hb_FGetDateTime( cDst, @tmp2 ) .OR. ;