diff --git a/modules/Makefile.in b/modules/Makefile.in
index c4f2c9fc3..20f6dc6a4 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -104,6 +104,7 @@ TSRCS =                          \
   m_tb.c \
   m_testline.c \
   m_testmask.c \
+  m_tginfo.c \
   m_time.c \
   m_topic.c \
   m_trace.c \
diff --git a/modules/m_tginfo.c b/modules/m_tginfo.c
new file mode 100644
index 000000000..83580972d
--- /dev/null
+++ b/modules/m_tginfo.c
@@ -0,0 +1,84 @@
+/*
+ * m_tginfo.c: propagates target-change status information
+ *
+ * Copyright (C) 2012 Keith Buck
+ * Copyright (C) 2012 charybdis development team
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1.Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * 2.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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include "stdinc.h"
+#include "client.h"
+#include "common.h"
+#include "match.h"
+#include "hash.h"
+#include "ircd.h"
+#include "numeric.h"
+#include "send.h"
+#include "msg.h"
+#include "modules.h"
+#include "s_newconf.h" /* add_tgchange */
+
+static int me_tginfo(struct Client *, struct Client *, int, const char **);
+
+struct Message tginfo_msgtab = {
+	"TGINFO", 0, 0, 0, MFLG_SLOW,
+	{mg_unreg, mg_ignore, mg_ignore, mg_ignore, {me_tginfo, 0}, mg_ignore}
+};
+
+mapi_clist_av1 tginfo_clist[] = { &tginfo_msgtab, NULL };
+
+DECLARE_MODULE_AV1(tginfo, NULL, NULL, tginfo_clist, NULL, NULL, "$Revision$");
+
+/*
+** me_tginfo
+**      parv[1] = 0, reserved for future use (number of remaining targets)
+*/
+static int
+me_tginfo(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+{
+	if (!IsPerson(source_p))
+		return 0;
+	if (parc != 2)
+		return 0;
+
+	int remaining = atoi(parv[1]);
+	if (remaining != 0)
+		return 0; /* not implemented */
+
+	if (!EmptyString(source_p->sockhost) && strcmp(source_p->sockhost, "0"))
+	{
+		/* We can't really add the tgchange if we don't have their IP... */
+		add_tgchange(source_p->sockhost);
+	}
+
+	if (!IsTGExcessive(source_p))
+	{
+		SetTGExcessive(source_p);
+		sendto_realops_snomask_from(SNO_BOTS, L_ALL, source_p->servptr,
+			"Excessive target change from %s (%s@%s)",
+			source_p->name, source_p->username, source_p->orighost);
+	}
+
+	return 0;
+}
diff --git a/src/tgchange.c b/src/tgchange.c
index 7059a287c..547eb5fb6 100644
--- a/src/tgchange.c
+++ b/src/tgchange.c
@@ -29,6 +29,7 @@
 #include "s_stats.h"
 #include "hash.h"
 #include "s_newconf.h"
+#include "s_serv.h"
 
 static int add_hashed_target(struct Client *source_p, uint32_t hashv);
 
@@ -126,12 +127,18 @@ add_hashed_target(struct Client *source_p, uint32_t hashv)
 			if (!IsTGExcessive(source_p))
 			{
 				SetTGExcessive(source_p);
-				sendto_realops_snomask(SNO_BOTS, L_NETWIDE,
+				/* This is sent to L_ALL because it's regenerated on all servers
+				 * that have the TGINFO module loaded.
+				 */
+				sendto_realops_snomask(SNO_BOTS, L_ALL,
 					"Excessive target change from %s (%s@%s)",
 					source_p->name, source_p->username,
 					source_p->orighost);
 			}
 
+			sendto_match_servs(source_p, "*", CAP_ENCAP, NOCAPS,
+				"ENCAP * TGINFO 0");
+
 			return 0;
 		}
 	}