diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 73cde1be4..b2b14354b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20100816
+--------
+main/net_ipx.c, main/net_udp.c: When switching from COOP to any other game mode, make sure Netgame.max_numplayers, MaxNumNetPlayers as well as the menu text showing the player limit is updated correctly
+
 20100815
 --------
 INSTALL.txt, include/physfsx.h, main/inferno.c, misc/physfsx.c: Added support to automatically load/mount ZIP files at startup, giving option to dynamically override or replace game content; Updated docs
diff --git a/main/net_ipx.c b/main/net_ipx.c
index 5c70041d8..1752b9747 100644
--- a/main/net_ipx.c
+++ b/main/net_ipx.c
@@ -3041,6 +3041,8 @@ int net_ipx_game_param_handler( newmenu *menu, d_event *event, param_opt *opt )
 					oldmaxnet=0;
 					menus[opt->maxnet].value=6;
 					menus[opt->maxnet].max_value=6;
+					sprintf( menus[opt->maxnet].text, "Maximum players: %d", menus[opt->maxnet].value+2 );
+					Netgame.max_numplayers = MaxNumNetPlayers = menus[opt->maxnet].value+2;
 				}
 			}
 
diff --git a/main/net_udp.c b/main/net_udp.c
index 144e2710b..1a1f17f34 100644
--- a/main/net_udp.c
+++ b/main/net_udp.c
@@ -3085,6 +3085,8 @@ int net_udp_game_param_handler( newmenu *menu, d_event *event, param_opt *opt )
 					oldmaxnet=0;
 					menus[opt->maxnet].value=6;
 					menus[opt->maxnet].max_value=6;
+					sprintf( menus[opt->maxnet].text, "Maximum players: %d", menus[opt->maxnet].value+2 );
+					Netgame.max_numplayers = MaxNumNetPlayers = menus[opt->maxnet].value+2;
 				}
 			}