diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 337ad5959c..7b8bbf6c24 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-03 12:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbmisc/Makefile
+  + contrib/hbmisc/fcomma.prg
+  - source/rdd/usrrdd/rdds/fcomma.prg
+  * source/rdd/usrrdd/rdds/Makefile
+    * fcomma.prg moved to hbmisc, since it depends on
+      hbmisc features.
+
+  * examples/hbextern/hbextern.prg
+    - Removed special treatment of fcomma.prg.
+
 2009-07-03 12:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/win/msvc.cf
   * config/wce/msvcarm.cf
diff --git a/harbour/contrib/hbmisc/Makefile b/harbour/contrib/hbmisc/Makefile
index be2e4767c3..e42c14a832 100644
--- a/harbour/contrib/hbmisc/Makefile
+++ b/harbour/contrib/hbmisc/Makefile
@@ -14,6 +14,7 @@ C_SOURCES=\
 	stringsx.c \
 
 PRG_SOURCES=\
+	fcomma.prg \
 	fileread.prg \
 	nconvert.prg \
 	numtxthu.prg \
diff --git a/harbour/source/rdd/usrrdd/rdds/fcomma.prg b/harbour/contrib/hbmisc/fcomma.prg
similarity index 100%
rename from harbour/source/rdd/usrrdd/rdds/fcomma.prg
rename to harbour/contrib/hbmisc/fcomma.prg
diff --git a/harbour/examples/hbextern/hbextern.prg b/harbour/examples/hbextern/hbextern.prg
index 4aac09bca2..cca3b1d4fb 100644
--- a/harbour/examples/hbextern/hbextern.prg
+++ b/harbour/examples/hbextern/hbextern.prg
@@ -78,7 +78,7 @@ REQUEST HB_GT_CGI_DEFAULT
 #endif
 
 // List of known files which does not contain any real public function.
-STATIC s_aSkipFiles := { "profiler.prg", "msg_tpl.c", "fcomma.prg" }
+STATIC s_aSkipFiles := { "profiler.prg", "msg_tpl.c" }
 STATIC s_aSkipDirs := { "tests", "examples", "sample", "samples", ".svn", "bsd", "darwin", "dos", "hpux", "linux", "os2", "sunos", "wce", "win" }
 
 STATIC s_aSkipNames  := { "MAIN" }   // Init with method names you want to skip
diff --git a/harbour/source/rdd/usrrdd/rdds/Makefile b/harbour/source/rdd/usrrdd/rdds/Makefile
index ee2ffd584a..96abf568c3 100644
--- a/harbour/source/rdd/usrrdd/rdds/Makefile
+++ b/harbour/source/rdd/usrrdd/rdds/Makefile
@@ -14,9 +14,6 @@ PRG_SOURCES=\
 	smtcdx.prg \
 	vfpcdx.prg \
 
-#	fcomma.prg \
-
-
 LIBNAME=hbuddall
 
 include $(TOP)$(ROOT)config/lib.cf