diff --git a/lldb/tools/debugserver/source/ChangeLog b/lldb/tools/debugserver/source/ChangeLog
index 2f3843bbc60f..851bcf0d9550 100644
--- a/lldb/tools/debugserver/source/ChangeLog
+++ b/lldb/tools/debugserver/source/ChangeLog
@@ -175,7 +175,7 @@
 	(RNBRemote::GetPacket): Call RNBRemote::HandlePacket_UNIMPLEMENTED()
 	when we don't recognize a packet.
 	(RNBRemote::HandleReceivedPacket): Don't reply to packets we don't
-	recognize with unimplemented in this fucntion as that should have
+	recognize with unimplemented in this function as that should have
 	already been done for us in RNBRemote::GetPacket().
 
 2009-02-10  Greg Clayton  <gclayton@apple.com>
diff --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp
index 14117612ebc0..d1c66150d581 100644
--- a/lldb/tools/debugserver/source/RNBRemote.cpp
+++ b/lldb/tools/debugserver/source/RNBRemote.cpp
@@ -97,7 +97,7 @@ RNBRemote::CreatePacketTable  ()
     // Step required to add new packets:
     // 1 - Add new enumeration to RNBRemote::PacketEnum
     // 2 - Create a the RNBRemote::HandlePacket_ function if a new function is needed
-    // 3 - Register the Packet definition with any needed callbacks in this fucntion
+    // 3 - Register the Packet definition with any needed callbacks in this function
     //          - If no response is needed for a command, then use NULL for the normal callback
     //          - If the packet is not supported while the target is running, use NULL for the async callback
     // 4 - If the packet is a standard packet (starts with a '$' character