diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8f14be8cc8..5403196ffd 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-29 21:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbide/ideprojmanager.prg
+    + Changed to not save hbide options with empty or
+      default values to .hbp files.
+
+  * contrib/hbqt/hbqscintilla/hbqscintilla.hbp
+  * contrib/gtwvg/tests/demowvg.hbp
+  * contrib/hbide/hbide.hbp
+    % Deleted empty and default hbide options from .hbp files.
+
 2010-06-29 21:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Addeded support for specifying dependencies in .hbc files.
diff --git a/harbour/contrib/gtwvg/tests/demowvg.hbp b/harbour/contrib/gtwvg/tests/demowvg.hbp
index 541318f830..8b3c5f5dba 100644
--- a/harbour/contrib/gtwvg/tests/demowvg.hbp
+++ b/harbour/contrib/gtwvg/tests/demowvg.hbp
@@ -3,17 +3,8 @@
 #
 
 -3rd=hbide_version=1.0
--3rd=hbide_type=Executable
 -3rd=hbide_title=Demo&GTWVG
--3rd=hbide_workingfolder=
--3rd=hbide_destinationfolder=
 -3rd=hbide_output=demowvg
--3rd=hbide_launchparams=
--3rd=hbide_launchprogram=
--3rd=hbide_backupfolder=
--3rd=hbide_xhb=NO
--3rd=hbide_xpp=NO
--3rd=hbide_clp=NO
 
 -inc
 -mt
diff --git a/harbour/contrib/hbide/hbide.hbp b/harbour/contrib/hbide/hbide.hbp
index 19040fd26e..8276ed04a0 100644
--- a/harbour/contrib/hbide/hbide.hbp
+++ b/harbour/contrib/hbide/hbide.hbp
@@ -1,15 +1,5 @@
 -3rd=hbide_version=1.0
--3rd=hbide_type=Executable
 -3rd=hbide_title=hbide
--3rd=hbide_workingfolder=
--3rd=hbide_destinationfolder=
--3rd=hbide_output=hbide
--3rd=hbide_launchparams=
--3rd=hbide_launchprogram=
--3rd=hbide_backupfolder=
--3rd=hbide_xhb=NO
--3rd=hbide_xpp=NO
--3rd=hbide_clp=NO
 
 -inc
 -w3
diff --git a/harbour/contrib/hbide/ideprojmanager.prg b/harbour/contrib/hbide/ideprojmanager.prg
index 165d0d9d7e..6d439d9baf 100644
--- a/harbour/contrib/hbide/ideprojmanager.prg
+++ b/harbour/contrib/hbide/ideprojmanager.prg
@@ -550,17 +550,39 @@ METHOD IdeProjManager:save( lCanClose )
    txt_:= {}
    //
    aadd( txt_, c3rd + "hbide_version="           + "1.0" )
-   aadd( txt_, c3rd + "hbide_type="              + { "Executable", "Lib", "Dll" }[ ::oUI:q_comboPrjType:currentIndex() + 1 ] )
-   aadd( txt_, c3rd + "hbide_title="             + hbide_space2amp( ::oUI:q_editPrjTitle    :text() ) )
-   aadd( txt_, c3rd + "hbide_workingfolder="     + hbide_space2amp( ::oUI:q_editWrkFolder   :text() ) )
-   aadd( txt_, c3rd + "hbide_destinationfolder=" + hbide_space2amp( ::oUI:q_editDstFolder   :text() ) )
-   aadd( txt_, c3rd + "hbide_output="            + hbide_space2amp( ::oUI:q_editOutName     :text() ) )
-   aadd( txt_, c3rd + "hbide_launchparams="      + hbide_space2amp( ::oUI:q_editLaunchParams:text() ) )
-   aadd( txt_, c3rd + "hbide_launchprogram="     + hbide_space2amp( ::oUI:q_editLaunchExe   :text() ) )
-   aadd( txt_, c3rd + "hbide_backupfolder="      + hbide_space2amp( ::oUI:q_editBackup      :text() ) )
-   aadd( txt_, c3rd + "hbide_xhb="               + iif( ::oUI:q_checkXhb:isChecked(), "YES", "NO" )   )
-   aadd( txt_, c3rd + "hbide_xpp="               + iif( ::oUI:q_checkXpp:isChecked(), "YES", "NO" )   )
-   aadd( txt_, c3rd + "hbide_clp="               + iif( ::oUI:q_checkClp:isChecked(), "YES", "NO" )   )
+   IF ::oUI:q_comboPrjType:currentIndex() != 0
+      aadd( txt_, c3rd + "hbide_type="              + { "Executable", "Lib", "Dll" }[ ::oUI:q_comboPrjType:currentIndex() + 1 ] )
+   ENDIF
+   IF ! Empty( ::oUI:q_editPrjTitle    :text() )
+      aadd( txt_, c3rd + "hbide_title="             + hbide_space2amp( ::oUI:q_editPrjTitle    :text() ) )
+   ENDIF
+   IF ! Empty( ::oUI:q_editWrkFolder   :text() )
+      aadd( txt_, c3rd + "hbide_workingfolder="     + hbide_space2amp( ::oUI:q_editWrkFolder   :text() ) )
+   ENDIF
+   IF ! Empty( ::oUI:q_editDstFolder   :text() )
+      aadd( txt_, c3rd + "hbide_destinationfolder=" + hbide_space2amp( ::oUI:q_editDstFolder   :text() ) )
+   ENDIF
+   IF ! Empty( ::oUI:q_editOutName     :text() )
+      aadd( txt_, c3rd + "hbide_output="            + hbide_space2amp( ::oUI:q_editOutName     :text() ) )
+   ENDIF
+   IF ! Empty( ::oUI:q_editLaunchParams:text() )
+      aadd( txt_, c3rd + "hbide_launchparams="      + hbide_space2amp( ::oUI:q_editLaunchParams:text() ) )
+   ENDIF
+   IF ! Empty( ::oUI:q_editLaunchExe   :text() )
+      aadd( txt_, c3rd + "hbide_launchprogram="     + hbide_space2amp( ::oUI:q_editLaunchExe   :text() ) )
+   ENDIF
+   IF ! Empty( ::oUI:q_editBackup      :text() )
+      aadd( txt_, c3rd + "hbide_backupfolder="      + hbide_space2amp( ::oUI:q_editBackup      :text() ) )
+   ENDIF
+   IF ::oUI:q_checkXhb:isChecked()
+      aadd( txt_, c3rd + "hbide_xhb="               + iif( ::oUI:q_checkXhb:isChecked(), "YES", "NO" )   )
+   ENDIF
+   IF ::oUI:q_checkXpp:isChecked()
+      aadd( txt_, c3rd + "hbide_xpp="               + iif( ::oUI:q_checkXpp:isChecked(), "YES", "NO" )   )
+   ENDIF
+   IF ::oUI:q_checkClp:isChecked()
+      aadd( txt_, c3rd + "hbide_clp="               + iif( ::oUI:q_checkClp:isChecked(), "YES", "NO" )   )
+   ENDIF
    aadd( txt_, " " )
    a_:= hbide_memoToArray( ::oUI:q_editFlags:toPlainText() )   ; aeval( a_, {|e| aadd( txt_, e ) } )
    aadd( txt_, " " )
diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp b/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp
index 9b06b28236..cbb582161e 100644
--- a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp
+++ b/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp
@@ -1,15 +1,7 @@
 -3rd=hbide_version=1.0
 -3rd=hbide_type=Lib
 -3rd=hbide_title=qscintilla
--3rd=hbide_workingfolder=
--3rd=hbide_destinationfolder=
 -3rd=hbide_output=qscintilla
--3rd=hbide_launchparams=
--3rd=hbide_launchprogram=
--3rd=hbide_backupfolder=
--3rd=hbide_xhb=NO
--3rd=hbide_xpp=NO
--3rd=hbide_clp=NO
 
 -info
 -trace