diff --git a/plugins/Ctcp/README.txt b/plugins/Ctcp/README.txt
new file mode 100644
index 000000000..d60b47a97
--- /dev/null
+++ b/plugins/Ctcp/README.txt
@@ -0,0 +1 @@
+Insert a description of your plugin here, with any notes, etc. about using it.
diff --git a/plugins/Ctcp/__init__.py b/plugins/Ctcp/__init__.py
new file mode 100644
index 000000000..ed126ed4f
--- /dev/null
+++ b/plugins/Ctcp/__init__.py
@@ -0,0 +1,59 @@
+###
+# Copyright (c) 2005, Jeremiah Fincher
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+###
+
+"""
+Handles standard CTCP responses to PING, TIME, SOURCE, VERSION, USERINFO,
+and FINGER.
+"""
+
+import supybot
+import supybot.world as world
+
+__version__ = "%%VERSION%%"
+
+__author__ = supybot.authors.jemfinch
+
+# This is a dictionary mapping supybot.Author instances to lists of
+# contributions.
+__contributors__ = {}
+
+import config
+import plugin
+reload(plugin) # In case we're being reloaded.
+# Add more reloads here if you add third-party modules and want them to be
+# reloaded when this plugin is reloaded.  Don't forget to import them as well!
+
+if world.testing:
+    import test
+
+Class = plugin.Class
+configure = config.configure
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/Ctcp/config.py b/plugins/Ctcp/config.py
new file mode 100644
index 000000000..70b735401
--- /dev/null
+++ b/plugins/Ctcp/config.py
@@ -0,0 +1,68 @@
+###
+# Copyright (c) 2005, Jeremiah Fincher
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+###
+
+import supybot.conf as conf
+import supybot.registry as registry
+
+def configure(advanced):
+    # This will be called by supybot to configure this module.  advanced is
+    # a bool that specifies whether the user identified himself as an advanced
+    # user or not.  You should effect your configuration by manipulating the
+    # registry as appropriate.
+    from supybot.questions import expect, anything, something, yn
+    conf.registerPlugin('Ctcp', True)
+
+
+###
+# Ctcp plugin configuration variables.
+###
+Ctcp = conf.registerPlugin('Ctcp')
+conf.registerGlobalValue(Ctcp, 'versionWait',
+    registry.PositiveInteger(10, """Determines how many seconds the bot will
+    wait after getting a version command (not a CTCP VERSION, but an actual
+    call of the command in this plugin named "version") before replying with
+    the results it has collected."""))
+
+###
+# supybot.abuse configuration variables.
+###
+conf.registerGlobalValue(conf.supybot.abuse.flood, 'ctcp',
+    registry.Boolean(True, """Determines whether the bot will defend itself
+    against CTCP flooding."""))
+conf.registerGlobalValue(conf.supybot.abuse.flood.ctcp, 'maximum',
+    registry.PositiveInteger(5, """Determines how many CTCP messages (not
+    including actions) the bot will reply to from a given user in a minute.
+    If a user sends more than this many CTCP messages in a 60 second period,
+    the bot will ignore CTCP messages from this user for
+    supybot.abuse.flood.ctcp.punishment seconds."""))
+conf.registerGlobalValue(conf.supybot.abuse.flood.ctcp, 'punishment',
+    registry.PositiveInteger(300, """Determines how many seconds the bot will
+    ignore CTCP messages from users who flood it with CTCP messages."""))
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
diff --git a/plugins/Ctcp/plugin.py b/plugins/Ctcp/plugin.py
new file mode 100644
index 000000000..496c41bbe
--- /dev/null
+++ b/plugins/Ctcp/plugin.py
@@ -0,0 +1,152 @@
+###
+# Copyright (c) 2002-2004, Jeremiah Fincher
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+###
+
+import time
+
+import supybot.conf as conf
+import supybot.utils as utils
+from supybot.commands import *
+import supybot.ircmsgs as ircmsgs
+import supybot.ircutils as ircutils
+import supybot.schedule as schedule
+import supybot.callbacks as callbacks
+
+class Ctcp(callbacks.PrivmsgCommandAndRegexp):
+    public = False
+    regexps = ('ctcpPing', 'ctcpVersion', 'ctcpUserinfo',
+               'ctcpTime', 'ctcpFinger', 'ctcpSource') 
+    def __init__(self, irc):
+        self.__parent = super(Ctcp, self)
+        self.__parent.__init__(irc)
+        self.ignores = ircutils.IrcDict()
+        self.floods = ircutils.FloodQueue(60)
+
+    def callCommand(self, name, irc, msg, *L, **kwargs):
+        if conf.supybot.abuse.flood.ctcp():
+            now = time.time()
+            for (ignore, expiration) in self.ignores.items():
+                if expiration < now:
+                    del self.ignores[ignore]
+                elif ircutils.hostmaskPatternEqual(ignore, msg.prefix):
+                        return
+            self.floods.enqueue(msg)
+            max = conf.supybot.abuse.flood.ctcp.maximum()
+            if self.floods.len(msg) > max:
+                expires = conf.supybot.abuse.flood.ctcp.punishment()
+                self.log.warning('Apparent CTCP flood from %s, '
+                                 'ignoring CTCP messages for %s seconds.',
+                                 msg.prefix, expires)
+                ignoreMask = '*!%s@%s' % (msg.user, msg.host)
+                self.ignores[ignoreMask] = now + expires
+                return
+        self.__parent.callCommand(name, irc, msg, *L, **kwargs)
+        
+    def _reply(self, irc, msg, s):
+        s = '\x01%s\x01' % s
+        irc.reply(s, notice=True, private=True, to=msg.nick)
+
+    def ctcpPing(self, irc, msg, match):
+        "\x01PING ?(.*)\x01"
+        self.log.info('Received CTCP PING from %s', msg.prefix)
+        payload = match.group(1)
+        if payload:
+            self._reply(irc, msg, 'PING %s' % match.group(1))
+        else:
+            self._reply(irc, msg, 'PING')
+
+    def ctcpVersion(self, irc, msg, match):
+        "\x01VERSION\x01"
+        self.log.info('Received CTCP VERSION from %s', msg.prefix)
+        self._reply(irc, msg, 'VERSION Supybot %s' % conf.version)
+
+    def ctcpUserinfo(self, irc, msg, match):
+        "\x01USERINFO\x01"
+        self.log.info('Received CTCP USERINFO from %s', msg.prefix)
+        self._reply(irc, msg, 'USERINFO')
+
+    def ctcpTime(self, irc, msg, match):
+        "\x01TIME\x01"
+        self.log.info('Received CTCP TIME from %s' % msg.prefix)
+        self._reply(irc, msg, 'TIME %s' % time.ctime())
+
+    def ctcpFinger(self, irc, msg, match):
+        "\x01FINGER\x01"
+        self.log.info('Received CTCP FINGER from %s' % msg.prefix)
+        self._reply(irc, msg,
+                    'FINGER Supybot, the best Python IRC bot in existence!')
+
+    def ctcpSource(self, irc, msg, match):
+        "\x01SOURCE\x01"
+        self.log.info('Received CTCP SOURCE from %s' % msg.prefix)
+        self._reply(irc, msg,
+                    'SOURCE http://www.sourceforge.net/projects/supybot/')
+
+    def doNotice(self, irc, msg):
+        if ircmsgs.isCtcp(msg):
+            try:
+                (version, payload) = msg.args[1][1:-1].split(None, 1)
+            except ValueError:
+                return
+            if version == 'VERSION':
+                self.versions.setdefault(payload, []).append(msg.nick)
+        
+    def version(self, irc, msg, args, channel, optlist):
+        """[<channel>] [--nicks]
+
+        Sends a CTCP VERSION to <channel>, returning the various
+        version strings returned.  It waits for 10 seconds before returning
+        the versions received at that point.  If --nicks is given, nicks are
+        associated with the version strings; otherwise, only the version
+        strings are given.
+        """
+        self.versions = ircutils.IrcDict()
+        nicks = False
+        for (option, arg) in optlist:
+            if option == 'nicks':
+                nicks = True
+        irc.queueMsg(ircmsgs.privmsg(channel, '\x01VERSION\x01'))
+        def doReply():
+            if self.versions:
+                L = []
+                for (reply, nicks) in self.versions.iteritems():
+                    if nicks:
+                        L.append('%s responded with %s' %
+                                 (utils.commaAndify(nicks),
+                                  utils.quoted(reply)))
+                    else:
+                        L.append(reply)
+                irc.reply(utils.commaAndify(L))
+            else:
+                irc.reply('I received no version responses.')
+        wait = self.registryValue('versionWait')
+        schedule.addEvent(doReply, time.time()+wait)
+    version = wrap(version, ['channel', getopts({'nicks':''})])
+
+Class = Ctcp
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/Ctcp/test.py b/plugins/Ctcp/test.py
new file mode 100644
index 000000000..a600018ad
--- /dev/null
+++ b/plugins/Ctcp/test.py
@@ -0,0 +1,37 @@
+###
+# Copyright (c) 2002-2004, Jeremiah Fincher
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+###
+
+from supybot.test import *
+
+class CtcpTestCase(PluginTestCase):
+    plugins = ('Ctcp',)
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+
diff --git a/setup.py b/setup.py
index 48175164d..7d018ce26 100644
--- a/setup.py
+++ b/setup.py
@@ -34,6 +34,7 @@ plugins = [
     'Babelfish',
     'Channel',
     'Config',
+    'Ctcp',
     'Dict',
     'Filter',
     'Format',