diff --git a/DXMainClient/DXGUI/Multiplayer/CnCNet/CnCNetLobby.cs b/DXMainClient/DXGUI/Multiplayer/CnCNet/CnCNetLobby.cs
index 2a7ff5a8b..582da71f6 100644
--- a/DXMainClient/DXGUI/Multiplayer/CnCNet/CnCNetLobby.cs
+++ b/DXMainClient/DXGUI/Multiplayer/CnCNet/CnCNetLobby.cs
@@ -560,6 +560,14 @@ private void PostUIInit()
                     string.Format("*** DTA CnCNet Client version {0} ***".L10N("Client:Main:CnCNetClientVersionMessage"), Assembly.GetAssembly(typeof(CnCNetLobby)).GetName().Version),
                     lbChatMessages.FontIndex)));
 
+            {
+                string developBuildWarningMessage = "This is a development build. Stability and reliability may not be fully guaranteed.".L10N("Client:Main:DevelopmentBuildWarning");
+#if DEVELOPMENT_BUILD
+                connectionManager.MainChannel.AddMessage(new ChatMessage(Color.Red, Renderer.GetSafeString(
+                        developBuildWarningMessage, lbChatMessages.FontIndex)));
+#endif
+            }
+
             connectionManager.BannedFromChannel += ConnectionManager_BannedFromChannel;
 
             loginWindow = new CnCNetLoginWindow(WindowManager);