diff --git a/gnoemoe/mcp/gm-mcp-icecrew-serverinfo.c b/gnoemoe/mcp/gm-mcp-icecrew-serverinfo.c
index afba11e..c96f2e9 100644
--- a/gnoemoe/mcp/gm-mcp-icecrew-serverinfo.c
+++ b/gnoemoe/mcp/gm-mcp-icecrew-serverinfo.c
@@ -362,6 +362,12 @@ void on_gm_mcp_icecrew_serverinfo_view_got_info(GmMcpIcecrewServerinfo *package,
 		gm_mcp_icecrew_serverinfo_view_set_visible(view, TRUE);		
 	}
 	
+	/* Set the charset */
+	if (package->priv->info.charset && *package->priv->info.charset != '\0')
+		gm_options_set(gm_world_options(GM_MCP_SESSION_WORLD(
+				GM_MCP_PACKAGE_SESSION(package))), "charset",
+				package->priv->info.charset);
+	
 	// TODO: set logo for world menu item
 }