diff --git a/harbour/utils/hbdoc/genpdf1.prg b/harbour/utils/hbdoc/genpdf1.prg
index ace111157d..8634af9994 100644
--- a/harbour/utils/hbdoc/genpdf1.prg
+++ b/harbour/utils/hbdoc/genpdf1.prg
@@ -173,7 +173,7 @@ local hhh
    hb_pdfnewpage("Harbour Guide",'Harbour Guide')
    hb_pdfendpage()
    else
-   ? 'im here'
+//   ? 'im here'
    HB_PDFNEW("pdf\harbour.pdf")
    hb_pdfnewpage("Harbour Guide",'Harbour Guide')
    hb_pdfinitbook(aResult)
@@ -210,17 +210,21 @@ local hhh
          //  Read a line
          cBuffer:=ReadLN( @lEof )
          if !lmemory
-            ? valtype(cBuffer)
-            ? cBuffer
+//            ? valtype(cBuffer)
+//            ? cBuffer
             fWrite(hhh,cBuffer+hb_osnewline())
 //            cBuffer:=" "
          Endif
-         if !lmemory
-         cBuffer := TRIM( SUBSTR( cBuffer, nCommentLen ) )
+         if len(cBuffer)<nCommentLen
+            cBuffer:="    "
          else
-         cBuffer :=  SUBSTR( cBuffer, nCommentLen )
+         if lmemory
+            cBuffer :=  SUBSTR( cBuffer, nCommentLen )
+         else
+            cBuffer := TRIM( SUBSTR( cBuffer, nCommentLen ) )
+         endif
+            cBuffer := STRTRAN( cBuffer, CHR( 10 ), "" )
          endif
-         cBuffer := STRTRAN( cBuffer, CHR( 10 ), "" )
          nLineCnt ++
 //         IF nLineCnt % 10 = 0
             @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 )         
@@ -257,10 +261,10 @@ local hhh
                ENDIF
                AADD( aDocInfo, { cCategory, cFuncName, cOneLine, cFileName } )
                if lMemory
-               nPos := ascan(aResult,{|a| UPPER(a) == UPPER(cCategory)})
-               if nPos==0
-                  aadd(aResult,cCategory)
-               endif
+                  nPos := ascan(aResult,{|a| UPPER(a) == UPPER(cCategory)})
+                     if nPos==0
+                        aadd(aResult,cCategory)
+                  endif
                endif
                //  Now close down this little piece
                lDoc := .F.
@@ -408,6 +412,9 @@ local hhh
                   else
 //                  oPdf:WriteTitle( PAD( cFuncName, 40 ), cFuncName ,cCategory,.t.)
                   HB_PDFNEWPAGE( PAD( cFuncName, 40 ), cFuncName)
+                  if empty(cCategory)
+                     cCategory                     := "Dos"
+                  endif
                   HB_PDFBOOKMARK(  cCategory,cFuncName,{|x| UPPER(x[1])==UPPER(cCategory )} )
 //                  HB_PDFINITBOOK(awww)
                   endif
@@ -698,8 +705,8 @@ local hhh
 HB_PDFCLOSE()
    if lmemory
 //      ferase('pdf\temp.pdf')
-fclose(hhh)
    endif
+fclose(hhh)
 
 RETURN Nil
 
diff --git a/harbour/utils/hbdoc/rtf.prg b/harbour/utils/hbdoc/rtf.prg
index 8ad25c12bc..e86fc29e4e 100644
--- a/harbour/utils/hbdoc/rtf.prg
+++ b/harbour/utils/hbdoc/rtf.prg
@@ -299,7 +299,7 @@ For nPos:=1 to nSize
     endif
 next
 cItem:=Alltrim(cItem)
-   FWRITE( Self:nHandle, '\par \pard\cf1\fs20       {\f6\uldb Related Topic }'+'{\v\f6 !ALink(" '+cItem + '", 2) }'+ CRLF )
+   FWRITE( Self:nHandle, '\par \pard\cf1\fs20       \{button , ALink('+cItem + ', 2) \}{\f6\uldb Related Topic }'+'{\v\f6 %!ALink(" '+cItem + '", 2) }'+ CRLF )
 else
 For nPos:=1 to nSize
     FWRITE( Self:nHandle, '\par \pard\cf1\fs20       {\f6\uldb '+aLink[nPos] +' }{\v\f6 !KLink(" '+UPPERLOWER(aLink[nPos]) + '", 2) }'+ CRLF )
diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg
index 5d1e1841ee..5257034f39 100644
--- a/harbour/utils/hbmake/hbmake.prg
+++ b/harbour/utils/hbmake/hbmake.prg
@@ -381,6 +381,11 @@ If Len( aCs ) > 0
          cTemp := Strtran( acs[ nPos ], ".c", ".prg" )
          If File( cTemp )
             Aadd( aPrgs, Strtran( acs[ nPos ], ".c", ".prg" ) )
+         else
+            cTemp := Strtran( acs[ nPos ], ".C", ".PRG" )
+               If File( cTemp )
+                  Aadd( aPrgs, Strtran( acs[ nPos ], ".C", ".PRG" ) )
+            endif
          Endif
       Endif
    Next
@@ -752,6 +757,13 @@ For nCount := 1 To Len( aOrder )
       If nPos > 0
          cComm := aCommands[ nPos, 2 ]
          cOld  := cComm
+      else
+         nPos := Ascan( aCommands, { | x, y | x[ 1 ] == ".PRG.C:" } )
+            If nPos > 0
+            cComm := aCommands[ nPos, 2 ]
+            cOld  := cComm
+         endif
+
       Endif
       For nFiles := 1 To Len( aPrgs )
          
@@ -767,13 +779,28 @@ For nCount := 1 To Len( aOrder )
    Endif
    If aOrder[ nCount ] == "$(OBJFILES)"
       If lGcc
-         nPos := Ascan( aCommands, { | x, y | x[ 1 ] == ".c.o:" } )
+         nPos := Ascan( aCommands, { | x, y | x[ 1 ] == ".c.o:" } )       
       Else
          nPos := Ascan( aCommands, { | x, y | x[ 1 ] == ".c.obj:" } )
       Endif
       If nPos > 0
          cComm := aCommands[ nPos, 2 ]
          cOld  := ccomm
+      else
+         if lGcc
+            nPos := Ascan( aCommands, { | x, y | x[ 1 ] == ".C.O:" } )
+            If nPos > 0
+               cComm := aCommands[ nPos, 2 ]
+               cOld  := cComm
+            endif
+         else
+         nPos := Ascan( aCommands, { | x, y | x[ 1 ] == ".C.OBJ:" } )
+            If nPos > 0
+            cComm := aCommands[ nPos, 2 ]
+            cOld  := cComm
+         endif
+
+      endif
       Endif
       For nFiles := 1 To Len( aCs )
 /*         if at("$",acs[nFiles])>0
@@ -1298,6 +1325,12 @@ For nCount := 1 To Len( aOrder )
       If nPos > 0
          cComm := aCommands[ nPos, 2 ]
          cOld  := cComm
+      else
+         nPos := Ascan( aCommands, { | x, y | x[ 1 ] == ".PRG.C:" } )
+            If nPos > 0
+            cComm := aCommands[ nPos, 2 ]
+            cOld  := cComm
+         endif
       Endif
       For nFiles := 1 To Len( aPrgs )
          nPos := Ascan( aCs, { | x | Left( x, At( ".", x ) ) == Left( aPrgs[ nFiles ], At( ".", aPrgs[ nFiles ] ) ) } )
@@ -1322,6 +1355,12 @@ For nCount := 1 To Len( aOrder )
       If nPos > 0
          cComm := aCommands[ nPos, 2 ]
          cOld  := ccomm
+      else
+         If lGcc
+            nPos := Ascan( aCommands, { | x, y | x[ 1 ] == ".C.O:" } )
+         Else
+            nPos := Ascan( aCommands, { | x, y | x[ 1 ] == ".C.OBJ:" } )
+         endif
       Endif
       For nFiles := 1 To Len( aCtocompile )
          nPos := Ascan( aObjs, { | x | Left( x, At( ".", x ) ) == Left( aCtocompile[ nFiles ], At( ".", aCtocompile[ nFiles ] ) ) } )