diff --git a/direct/src/distributed/ClientRepository.py b/direct/src/distributed/ClientRepository.py
index f2479b1bc9..a191653b7c 100644
--- a/direct/src/distributed/ClientRepository.py
+++ b/direct/src/distributed/ClientRepository.py
@@ -537,11 +537,18 @@ class ClientRepository(DirectObject.DirectObject):
             self.bootedText = None
             ClientRepository.notify.warning(
                 "Server is booting us out with no explanation.")
+
+
+    def handleServerHeartbeat(self, di):
+        # Got a heartbeat message from the server.
+        ClientRepository.notify.info("Server heartbeat.")
         
 
     def handleUnexpectedMsgType(self, msgType, di):
         if msgType == CLIENT_GO_GET_LOST:
             self.handleGoGetLost(di)
+        elif msgType == CLIENT_HEARTBEAT:
+            self.handleServerHeartbeat(di)
         else:
             currentLoginState = self.loginFSM.getCurrentState()
             if currentLoginState:
diff --git a/direct/src/distributed/MsgTypes.py b/direct/src/distributed/MsgTypes.py
index ad90ba0704..3a23140b40 100644
--- a/direct/src/distributed/MsgTypes.py
+++ b/direct/src/distributed/MsgTypes.py
@@ -12,6 +12,8 @@ CLIENT_SET_SHARD =                           31
 CLIENT_CREATE_OBJECT_REQUIRED =              34
 CLIENT_CREATE_OBJECT_REQUIRED_OTHER =        35
 
+CLIENT_HEARTBEAT =                           52
+
 # These messages are ignored when the client is headed to the quiet zone
 QUIET_ZONE_IGNORED_LIST = [