diff -r 651537e438ca -r 8d988a6d2f4c src/buddy.c
--- a/src/buddy.c	Fri Apr 12 02:13:13 2002 +0000
+++ b/src/buddy.c	Fri Apr 12 02:15:24 2002 +0000
@@ -754,6 +754,7 @@
 	GtkCTreeNode *node = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), NULL, b);
 	g_snprintf(b->show, sizeof(b->show), "%s", b->name);
 	gtk_ctree_node_set_text(GTK_CTREE(edittree), node, 0, b->name);
+	serv_alias_buddy(b);
 	if (gs)
 		bs = find_buddy_show(gs, b->name);
 	if (bs)
@@ -1094,9 +1095,15 @@
 		} else
 			new_g->members = g_slist_append(new_g->members, buddy);
 
-		/* we do the add after it's added locally so that prpls can find it if necessary */
-		if (add)
+		/*
+		 * we do the add after it's added locally so that prpls can find it if necessary
+		 * JFIXME: Er, shouldn't the buddy be removed from the old server, as well?
+		 */
+		if (add) {
 			serv_add_buddy(new_g->gc, buddy->name);
+		} else {
+			serv_move_buddy(buddy, old_g, new_g);
+		}
 
 		do_export(buddy->gc);
 		if (buddy->gc != new_g->gc) {