diff --git a/midori/sokoke.c b/midori/sokoke.c
index b734cdee..643848ce 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -380,12 +380,7 @@ sokoke_hostname_from_uri (const gchar* uri,
         if (hostname[1] == '/')
             hostname += 2;
         if ((*path = g_utf8_strchr (hostname, -1, '/')))
-        {
-            gulong offset = g_utf8_pointer_to_offset (hostname, *path);
-            gchar* buffer = g_malloc0 (offset + 1);
-            g_utf8_strncpy (buffer, hostname, offset);
-            hostname = buffer;
-        }
+            hostname = g_strndup (hostname, *path - hostname);
         else
             hostname = g_strdup (hostname);
     }
diff --git a/tests/magic-uri.c b/tests/magic-uri.c
index 826ae896..a4e58c95 100644
--- a/tests/magic-uri.c
+++ b/tests/magic-uri.c
@@ -211,6 +211,8 @@ magic_uri_format (void)
        "http://digilife.bz/wiki/index.php?Pythonの開発手順" },
      { "http://die-welt.net/~evgeni/LenovoBatteryLinux/", NULL },
      { "http://wiki.c3sl.ufpr.br/multiseat/index.php/Xephyr_Solution", NULL },
+     { "http://şøñđëřżēıċħęŋđőmæîņĭśŧşũþėŗ.de/char.jpg", NULL },
+     { "http://www.ⓖⓝⓞⓜⓔ.org/", "http://www.gnome.org/" },
      };
     guint i;