diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2da7380af8..aef30c27b5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-20 16:49 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * contrib/hbqt/generator/hbqtgen.prg
+    ! Two small fixes. No code regeneration required.
+
 2010-05-21 01:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
     + Showing warning when HB_BUILD_IMPLIB=yes is used without
diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg
index 2d5c24474a..2e62738468 100644
--- a/harbour/contrib/hbqt/generator/hbqtgen.prg
+++ b/harbour/contrib/hbqt/generator/hbqtgen.prg
@@ -767,6 +767,8 @@ FUNCTION GetSourcePathByLib( cWidget, cPathOut, cExt, cPre )
       cFileOut := cPathOut + s_PathSep + "qtwebkit" + s_pathSep + cPre + cWidget + cExt
    ELSEIF ascan( aNetwork, cWidget ) > 0
       cFileOut := cPathOut + s_PathSep + "qtnetwork" + s_pathSep + cPre + cWidget + cExt
+   ELSE
+      cFileOut := cPathOut + s_PathSep + cPre + cWidget + cExt
    ENDIF
 
    RETURN cFileOut
@@ -1576,7 +1578,7 @@ STATIC FUNCTION HBRawVersion()
 STATIC FUNCTION CreateTarget( cFile, txt_ )
    LOCAL cContent := ""
 
-   AEval( txt_, { |e| cContent += RTrim( e ) + s_NewLine } )
+   AEval( txt_, { |e| cContent += RTrim( e ) + hb_osNewLine() } )
 
    /* Save it only if it has changed. */
    IF !( hb_MemoRead( cFile ) == cContent )
@@ -1708,6 +1710,8 @@ STATIC FUNCTION Build_Document( cWidget, cls_, doc_, cPathDoc, subCls_, docum_ )
       cLib := "qtwebkit"
    ELSEIF ascan( aNetwork, cWidget ) > 0
       cLib := "qtnetwork"
+   ELSE
+      cLib := ""
    ENDIF
 
    aadd( txt_, '/* '  )