diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d3f29f87ca..27b9d8711b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,23 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-29 13:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbide/ideplugins.prg
+    + Added support for .hbs extension (handled similarly as .prg).
+      The logic is very fuzzy here, it could be greatly simplified
+      like it is in hbrun or hbmk2. I don't understand why hbide
+      is trying to guess the filename, shouldn't it be the basic
+      input parameter? or even better the result of a DIRECTORY()
+      scan, as we've discussed?
+
+  * contrib/hbide/plugins/savebackup.prg
+    - Deleted .ch header reference to make it work as source
+      code plugin.
+
+  - contrib/hbide/plugins/savebackup.hrb
+    - Delete prebuilt .hrb. It's better to use the source version
+      by default.
+
 2010-06-29 13:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbide/hbide.env
     ! Fixed all entries. Synced with INSTALL and other required changes
diff --git a/harbour/contrib/hbide/ideplugins.prg b/harbour/contrib/hbide/ideplugins.prg
index 887f94feee..923860bf0a 100644
--- a/harbour/contrib/hbide/ideplugins.prg
+++ b/harbour/contrib/hbide/ideplugins.prg
@@ -126,6 +126,15 @@ STATIC FUNCTION hbide_loadAPlugin( cPlugin, oIde, cVer )
          IF ! Empty( cFile )
             pHrb := hb_hrbLoad( HB_HRB_BIND_OVERLOAD, cFile )
          ENDIF
+      ELSE
+         cFileName := hb_dirBase() + hb_osPathSeparator() + "plugins" + hb_osPathSeparator() + cPlugin + ".hbs"
+         IF hb_fileExists( cFileName )
+            cFile := hb_memoread( cFileName )
+            cFile := hb_compileFromBuf( cFile, "-n2", "-w3", "-es2", "-q0" )
+            IF ! Empty( cFile )
+               pHrb := hb_hrbLoad( HB_HRB_BIND_OVERLOAD, cFile )
+            ENDIF
+         ENDIF
       ENDIF
    ENDIF
 
diff --git a/harbour/contrib/hbide/plugins/savebackup.hrb b/harbour/contrib/hbide/plugins/savebackup.hrb
deleted file mode 100644
index a2d994829e..0000000000
Binary files a/harbour/contrib/hbide/plugins/savebackup.hrb and /dev/null differ
diff --git a/harbour/contrib/hbide/plugins/savebackup.prg b/harbour/contrib/hbide/plugins/savebackup.prg
index eacc1e4096..3bf892eb3f 100644
--- a/harbour/contrib/hbide/plugins/savebackup.prg
+++ b/harbour/contrib/hbide/plugins/savebackup.prg
@@ -51,10 +51,6 @@
 
 /*----------------------------------------------------------------------*/
 
-#include "common.ch"
-
-/*----------------------------------------------------------------------*/
-
 FUNCTION savebackup_init( oIde, cVer )
 
    HB_SYMBOL_UNUSED( oIde )