diff --git a/src/cpp/ripple/Peer.cpp b/src/cpp/ripple/Peer.cpp
index d3fbd0e9c..d68d98030 100644
--- a/src/cpp/ripple/Peer.cpp
+++ b/src/cpp/ripple/Peer.cpp
@@ -1157,6 +1157,11 @@ void Peer::recvGetObjectByHash(ripple::TMGetObjectByHash& packet)
 
 void Peer::recvPing(ripple::TMPing& packet)
 {
+	if (packet.type() == ripple::TMPing::PING)
+	{
+		packet.set_type(ripple::TMPing::PONG);
+		sendPacket(boost::make_shared<PackedMessage>(packet, ripple::mtPING));
+	}
 }
 
 void Peer::recvErrorMessage(ripple::TMErrorMsg& packet)