diff --git a/data/fonts/Kochi.ttf b/data/fonts/Kochi.ttf
new file mode 100644
index 000000000..ec093e0ea
Binary files /dev/null and b/data/fonts/Kochi.ttf differ
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
index 46f323f9a..3b7d61948 100644
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 filesdir = $(datadir)/enlightenment/data/fonts
 files_DATA = \
+Kochi.ttf \
 Vera.ttf \
 VeraBI.ttf \
 VeraBd.ttf \
diff --git a/data/fonts/fonts.alias b/data/fonts/fonts.alias
index bbb99b3fe..1d793cf40 100644
--- a/data/fonts/fonts.alias
+++ b/data/fonts/fonts.alias
@@ -1,7 +1,8 @@
+Kochi -Unknown-Kochi-medium-r-normal--0-0-0-0-p-0-iso8859-9
 Vera-Bold-Italic -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-ascii-0
 Vera-Normal -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-ascii-0
 Vera-Bold -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-ascii-0
-Vera-Italic -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-ascii-
+Vera-Italic -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-ascii-0
 Vera-Mono-Bold-Italic -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-m-0-ascii-0
 Vera-Mono-Bold -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-m-0-ascii-0
 Vera-Mono-Italic -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-m-0-ascii-0
diff --git a/data/fonts/fonts.dir b/data/fonts/fonts.dir
index 2dab016e1..0954e2140 100644
--- a/data/fonts/fonts.dir
+++ b/data/fonts/fonts.dir
@@ -1,4 +1,5 @@
-50
+51
+Kochi.ttf -Unknown-Kochi-medium-r-normal--0-0-0-0-p-0-iso8859-9
 VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-ascii-0
 VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-fcd8859-15
 VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-1
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 1a2195dcc..c27d652fd 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -915,7 +915,7 @@ e_border_maximize(E_Border *bd)
 
 	/* FIXME maximize intelligently */
 	e_border_raise(bd);
-	e_border_move_resize(bd, 0, 0, bd->zone->w, bd->zone->h);
+	e_border_move_resize(bd, bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
 	bd->maximized = 1;
 	bd->changes.pos = 1;
 	bd->changes.size = 1;
@@ -2288,6 +2288,7 @@ _e_border_eval(E_Border *bd)
 	if (bd->bg_object)
 	  {
 	     edje_object_part_text_set(bd->bg_object, "title_text",
+//				       "Japanese (hiragana): いろはにほへとちりぬるを");
 				       bd->client.icccm.title);
 //	     printf("SET TITLE %s\n", bd->client.icccm.title);
 	  }
@@ -2531,6 +2532,7 @@ _e_border_eval(E_Border *bd)
 	if (ok)
 	  {
 	     edje_object_part_text_set(o, "title_text",
+//				       "Japanese (hiragana): いろはにほへとちりぬるを");
 				       bd->client.icccm.title);
 //	     printf("SET TITLE2 %s\n", bd->client.icccm.title);
 	     evas_object_resize(o, 1000, 1000);
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 88fbb2389..72da49350 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -247,6 +247,9 @@ main(int argc, char **argv)
    
    /* setup edje to animate @ e_config->framerate frames per sec. */
    edje_frametime_set(1.0 / e_config->framerate);
+   /* FIXME: this is just appending Kochi if Vera doesnt have it. We need
+    * a full config support subsystem for this */
+   edje_fontset_append_set("Kochi");
    e_canvas_recache();
    
    /* setup init status window/screen */