diff --git a/pvpgn/src/bnetd/output.cpp b/pvpgn/src/bnetd/output.cpp
index 12a6768bc..b5d0c92a3 100644
--- a/pvpgn/src/bnetd/output.cpp
+++ b/pvpgn/src/bnetd/output.cpp
@@ -69,7 +69,7 @@ static int _glist_cb_xml(t_game *game, void *data)
 {
     char clienttag_str[5];
 
-    std::fprintf((std::FILE*)data,"\t\t<game><name>%s</name><clienttag>%s</clienttag></game>\n",game_get_name(game),tag_uint_to_str(clienttag_str,game_get_clienttag(game)));
+    std::fprintf((std::FILE*)data,"\t\t<game><id>%u</id><name>%s</name><clienttag>%s</clienttag></game>\n",game_get_id(game),game_get_name(game),tag_uint_to_str(clienttag_str,game_get_clienttag(game)));
 
     return 0;
 }
@@ -127,8 +127,12 @@ int output_standard_writer(std::FILE * fp)
 	{
 	    conn = (t_connection*)elem_get_data(curr);
 	    if (conn_get_account(conn))
-		std::fprintf(fp,"\t\t<user><name>%s</name><clienttag>%s</clienttag><version>%s</version></user>\n",conn_get_username(conn),tag_uint_to_str(clienttag_str,conn_get_clienttag(conn)),conn_get_clientver(conn));
-        }
+			std::fprintf(fp,"\t\t<user><name>%s</name><clienttag>%s</clienttag><version>%s</version>",conn_get_username(conn),tag_uint_to_str(clienttag_str,conn_get_clienttag(conn)),conn_get_clientver(conn));
+			
+			if ((game = conn_get_game(conn)))
+				std::fprintf(fp,"<gameid>%u</gameid>", game_get_id(game));
+			fprintf(fp,"</user>\n");
+    }
 
 	std::fprintf(fp,"\t\t</Users>\n");
 	std::fprintf(fp,"\t\t<Games>\n");