diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a096782bfb..3b958b0539 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-06-13 15:31 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbrun/hbrun.prg
+  * utils/hbmk2/hbmk2.prg
+    * renamed history file to have a tool agnostic name
+      INCOMPATIBLE (history will be lost unless you rename
+      the existing file from .hbrun_history to .hb_history)
+
 2012-06-13 15:14 UTC+0200 Viktor Szakats (harbour syenar.net)
   * INSTALL
     * minor clarifications to INSTALL/TROUBLESHOOTING
diff --git a/harbour/contrib/hbrun/hbrun.prg b/harbour/contrib/hbrun/hbrun.prg
index c03a90f25b..10d74149bc 100644
--- a/harbour/contrib/hbrun/hbrun.prg
+++ b/harbour/contrib/hbrun/hbrun.prg
@@ -756,9 +756,9 @@ STATIC FUNCTION hbrun_HistoryFileName()
 #endif
 
 #if defined( __PLATFORM__DOS )
-   cFileName := "hbrunhst.ini"
+   cFileName := "hbhist.ini"
 #else
-   cFileName := ".hbrun_history"
+   cFileName := ".hb_history"
 #endif
 
    IF ! Empty( GetEnv( cEnvVar ) )
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index de3bf60ef5..ab9c654da7 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -12847,9 +12847,9 @@ STATIC FUNCTION __hbrun_HistoryFileName()
 #endif
 
 #if defined( __PLATFORM__DOS )
-   cFileName := "hbrunhst.ini"
+   cFileName := "hbhist.ini"
 #else
-   cFileName := ".hbrun_history"
+   cFileName := ".hb_history"
 #endif
 
    IF ! Empty( GetEnv( cEnvVar ) )