diff --git a/modules/Echo.py b/modules/Echo.py
index ddf44bc..6b0eeb4 100644
--- a/modules/Echo.py
+++ b/modules/Echo.py
@@ -26,11 +26,27 @@ class Echo(Module):
     def register_handlers(self):
         """Hook handler functions into the IRC library."""
 
+        # register IRC regex handlers
         self.irc.add_global_regex_handler('pubmsg', r'^!echo\s+(.*)$',
                                           self.echo)
         self.irc.add_global_regex_handler('privmsg', r'^!echo\s+(.*)$',
                                           self.echo)
 
+        # register XML-RPC handlers
+        def echo_wrap(msg):
+            """Get back the sent message.
+
+            Args:
+                msg     the message to get returned
+
+            Returns:
+                msg
+
+            """
+
+            return self.echo(None, None, None, False, (msg,))
+        self.irc.xmlrpc_register_function(echo_wrap, 'echo')
+
     def unregister_handlers(self):
         """Unhook handler functions from the IRC library."""