# Calculate format=diff merge(net-irc/hexchat)<2.16
diff --git a/src/common/servlist.c b/src/common/servlist.c
index dd427a5..543b3ed 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -96,6 +96,8 @@ static const struct defaultserver def[] =
 	{0,			"irc.betachat.net"},
 	{"BuddyIM", 0, 0, 0, LOGIN_SASL, 0, TRUE},
 	{0,			"irc.buddy.im"},
+	{"CalculateIRC", 0, 0, 0, LOGIN_SASL, 0, TRUE},
+	{0,			"irc.calculate.social"},
 	{"Canternet", 0, 0, 0, LOGIN_SASL, 0, TRUE},
 	{0,			"irc.canternet.org"},
 
@@ -933,7 +935,7 @@ servlist_load_defaults (void)
 {
 	int i = 0, j = 0;
 	ircnet *net = NULL;
-	guint def_hash = g_str_hash ("Libera.Chat");
+	guint def_hash = g_str_hash ("CalculateIRC");
 
 	while (1)
 	{
diff --git a/src/fe-gtk/joind.c b/src/fe-gtk/joind.c
index ce3cbca..e7bcb9a 100644
--- a/src/fe-gtk/joind.c
+++ b/src/fe-gtk/joind.c
@@ -247,9 +247,9 @@ joind_show_dialog (server *serv)
 							G_CALLBACK (joind_ok_cb), serv);
 							
 	if (serv->network)
-		if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "Libera.Chat") == 0)
+		if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "CalculateIRC") == 0)
 		{
-			gtk_entry_set_text (GTK_ENTRY (entry1), "#hexchat");
+			gtk_entry_set_text (GTK_ENTRY (entry1), "#chat");
 		}
 
 	gtk_widget_grab_focus (okbutton1);
