diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5ee8547258..264ebecc56 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-21 00:11 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  - contrib/iodmem
+  + contrib/hbmemio
+  - contrib/hbmemio/iodmem.hbc
+  + contrib/hbmemio/hbmemio.hbc
+  * contrib/hbmemio/Makefile
+  * contrib/Makefile
+    * Renamed to have 'hb' prefix and to be in line with hbnetio.
+    ! Fixed props on Makefile.
+    ! Corrected to list this lib in no-dependency section in contrib/Makefile.
+
 2009-09-21 22:50 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   + harbour/contrib/Makefile
   + harbour/contrib/iodmem/Makefile
@@ -29,10 +40,10 @@
 2009-09-21 17:20 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   + harbour/contrib/iodmem
   + harbour/contrib/iodmem/iodmem.c
-    + Implemented Memory file system. Public functions hb_memfs*() are 
+    + Implemented Memory file system. Public functions hb_memfs*() are
       availible, if HB_MEMFS_PUBLIC_API is defined.
     + Implemeted I/O driver for memory file system
-    ; HB_IODMEM request can be used to force linking of I/O driver and 
+    ; HB_IODMEM request can be used to force linking of I/O driver and
       memory FS into executable.
       "mem:" prefix should be used to indicate a MemFS file, ex.:
 
@@ -52,8 +63,8 @@
         DBDROP("mem:test")  // Free memory resource
       RETURN
 
-    ; TODO: locking is not supported yet (but it is not very usefull 
-      if MemFS is used to store of a temporary database opened in 
+    ; TODO: locking is not supported yet (but it is not very usefull
+      if MemFS is used to store of a temporary database opened in
       exclusive mode).
 
 2009-09-21 15:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile
index 465a522b4b..85c710f21e 100644
--- a/harbour/contrib/Makefile
+++ b/harbour/contrib/Makefile
@@ -15,6 +15,7 @@ DIRS := \
    hbclipsm \
    hbct \
    hbgt \
+   hbmemio \
    hbmisc \
    hbmzip \
    hbnetio \
@@ -42,7 +43,6 @@ DIRS += \
    hbpgsql \
    hbqt \
    hbssl \
-   iodmem \
    rddads \
    rddsql \
 
diff --git a/harbour/contrib/iodmem/Makefile b/harbour/contrib/hbmemio/Makefile
similarity index 83%
rename from harbour/contrib/iodmem/Makefile
rename to harbour/contrib/hbmemio/Makefile
index aed89c143f..0636b9b075 100644
--- a/harbour/contrib/iodmem/Makefile
+++ b/harbour/contrib/hbmemio/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-LIBNAME := iodmem
+LIBNAME := hbmemio
 
 C_SOURCES := \
    iodmem.c \
diff --git a/harbour/contrib/hbmemio/hbmemio.hbc b/harbour/contrib/hbmemio/hbmemio.hbc
new file mode 100644
index 0000000000..07f94b234b
--- /dev/null
+++ b/harbour/contrib/hbmemio/hbmemio.hbc
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+libs=hbmemio
diff --git a/harbour/contrib/iodmem/iodmem.c b/harbour/contrib/hbmemio/iodmem.c
similarity index 100%
rename from harbour/contrib/iodmem/iodmem.c
rename to harbour/contrib/hbmemio/iodmem.c
diff --git a/harbour/contrib/iodmem/iodmem.hbc b/harbour/contrib/iodmem/iodmem.hbc
deleted file mode 100644
index ae58518cc6..0000000000
--- a/harbour/contrib/iodmem/iodmem.hbc
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# $Id$
-#
-
-libs=iodmem