diff --git a/legacy/eet/ChangeLog b/legacy/eet/ChangeLog
index 7539043dab..749af8827f 100644
--- a/legacy/eet/ChangeLog
+++ b/legacy/eet/ChangeLog
@@ -288,4 +288,7 @@
 
 	* More work on eet_node dump code.
 
+2009-12-28  Cedric BAIL
+
+	* Add fully functionnal eet_node dump code.
 
diff --git a/legacy/eet/src/lib/eet_node.c b/legacy/eet/src/lib/eet_node.c
index fdd275982c..ea75d6d64a 100644
--- a/legacy/eet/src/lib/eet_node.c
+++ b/legacy/eet/src/lib/eet_node.c
@@ -389,15 +389,41 @@ eet_node_dump_group_end(int level, void (*dumpfunc) (void *data, const char *str
 void
 eet_node_dump(Eet_Node *n, int dumplevel, void (*dumpfunc) (void *data, const char *str), void *dumpdata)
 {
+   Eet_Node *it;
+
+   if (!n) return ;
+
    switch (n->type)
      {
-      case EET_G_HASH:
-      case EET_G_UNKNOWN:
       case EET_G_VAR_ARRAY:
       case EET_G_ARRAY:
+      case EET_G_UNKNOWN:
+      case EET_G_HASH:
       case EET_G_LIST:
-	 eet_node_dump_group_start(dumplevel, dumpfunc, dumpdata, n->type, n->name);
-	 /* FIXME: Handle content of group. */
+	 eet_node_dump_group_start(dumplevel + 1, dumpfunc, dumpdata, n->type, n->name);
+
+	 if (n->type == EET_G_VAR_ARRAY
+	     || n->type == EET_G_ARRAY)
+	   {
+	      char tbuf[256];
+
+	      eet_node_dump_level(dumplevel, dumpfunc, dumpdata);
+	      dumpfunc(dumpdata, "    count ");
+	      eina_convert_itoa(n->count, tbuf);
+	      dumpfunc(dumpdata, tbuf);
+	      dumpfunc(dumpdata, ";\n");
+	   }
+	 else if (n->type == EET_G_HASH)
+	   {
+	      eet_node_dump_level(dumplevel, dumpfunc, dumpdata);
+	      dumpfunc(dumpdata, "    key \"");
+	      eet_node_dump_string_escape(dumpdata, dumpfunc, n->key);
+	      dumpfunc(dumpdata, "\";\n");
+	   }
+
+	 for (it = n->values; it != NULL; it = it->next)
+	   eet_node_dump(it, dumplevel + 2, dumpfunc, dumpdata);
+
 	 eet_node_dump_group_end(dumplevel, dumpfunc, dumpdata);
 	 break;
       case EET_T_STRING: