diff --git a/roles/koji_hub/templates/fedmsg-koji-plugin.py b/roles/koji_hub/templates/fedmsg-koji-plugin.py
index 0f95fca..d403aee 100644
--- a/roles/koji_hub/templates/fedmsg-koji-plugin.py
+++ b/roles/koji_hub/templates/fedmsg-koji-plugin.py
@@ -5,6 +5,7 @@
 #     Ralph Bean <rbean@redhat.com>
 #     Mike Bonnet <mikeb@redhat.com>

+from koji.context import context
 from koji.plugin import callbacks
 from koji.plugin import callback
 from koji.plugin import ignore_error
@@ -118,10 +119,11 @@ def get_message_body(topic, *args, **kws):
     c for c in callbacks.keys()
     if c.startswith('post') and c not in [
         'postImport', # This is kind of useless; also noisy.
+        'postCommit', # This is special.
     ]
 ])
 @ignore_error
-def send_message(cbtype, *args, **kws):
+def prep_message(cbtype, *args, **kws):
     if cbtype.startswith('post'):
         msgtype = cbtype[4:]
     else:
@@ -169,4 +171,16 @@ def send_message(cbtype, *args, **kws):

     body = scrub(body)

-    fedmsg.publish(topic=topic, msg=body, modname='buildsys')
+    message = dict(topic=topic, msg=body, modname='buildsys')
+    messages = getattr(context, 'fedmsg_plugin_messages', [])
+    messages.append(message)
+    context.fedmsg_plugin_messages = messages
+
+
+# This only gets called at the end of the transaction.  Flush our messages out to the bus.
+@callback('postCommit')
+@ignore_error
+def send_messages(cbtype, *args, **kws):
+    messages = getattr(context, 'fedmsg_plugin_messages', [])
+    for message in messages:
+        fedmsg.publish(**message)