diff --git a/files/hotfix/autocloud/consumer.py b/files/hotfix/autocloud/consumer.py
new file mode 100644
index 0000000000..8f9bf95974
--- /dev/null
+++ b/files/hotfix/autocloud/consumer.py
@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+
+import fedmsg.consumers
+import koji
+
+from autocloud.utils import get_image_url, produce_jobs, get_image_name
+import autocloud
+
+import logging
+log = logging.getLogger("fedmsg")
+
+DEBUG = autocloud.DEBUG
+
+
+class AutoCloudConsumer(fedmsg.consumers.FedmsgConsumer):
+
+    if DEBUG:
+        topic = 'org.fedoraproject.dev.__main__.buildsys.task.state.change'
+    else:
+        topic = 'org.fedoraproject.prod.buildsys.task.state.change'
+
+    config_key = 'autocloud.consumer.enabled'
+
+    def __init__(self, *args, **kwargs):
+        super(AutoCloudConsumer, self).__init__(*args, **kwargs)
+
+    def _get_tasks(self, builds):
+        """ Takes a list of koji createImage task IDs and returns dictionary of
+        build ids and image url corresponding to that build ids"""
+
+        if autocloud.VIRTUALBOX:
+            _supported_images = ('Fedora-Cloud-Base-Vagrant',
+                                 'Fedora-Cloud-Atomic-Vagrant',)
+        else:
+            _supported_images = ('Fedora-Cloud-Base-Vagrant',
+                                 'Fedora-Cloud-Atomic-Vagrant',
+                                 'Fedora-Cloud-Atomic', 'Fedora-Cloud-Base',)
+
+        for build in builds:
+            log.info('Got Koji build {0}'.format(build))
+
+        # Create a Koji connection to the Fedora Koji instance
+        koji_session = koji.ClientSession(autocloud.KOJI_SERVER_URL)
+
+        image_files = []  # list of full URLs of files
+
+        if len(builds) == 1:
+            task_result = koji_session.getTaskResult(builds[0])
+            name = task_result.get('name')
+            #TODO: Change to get the release information from PDC instead
+            # of koji once it is set up
+            release = task_result.get('version')
+            if name in _supported_images:
+                task_relpath = koji.pathinfo.taskrelpath(int(builds[0]))
+                url = get_image_url(task_result.get('files'), task_relpath)
+                if url:
+                    name = get_image_name(image_name=name)
+                    data = {
+                        'buildid': builds[0],
+                        'image_url': url,
+                        'name': name,
+                        'release': release,
+                    }
+                    image_files.append(data)
+        elif len(builds) >= 2:
+            koji_session.multicall = True
+            for build in builds:
+                koji_session.getTaskResult(build)
+            results = koji_session.multiCall()
+            for result in results:
+
+                if not result:
+                    continue
+
+                name = result[0].get('name')
+                if name not in _supported_images:
+                    continue
+
+                #TODO: Change to get the release information from PDC instead
+                # of koji once it is set up
+                release = result[0].get('version')
+                task_relpath = koji.pathinfo.taskrelpath(
+                    int(result[0].get('task_id')))
+                url = get_image_url(result[0].get('files'), task_relpath)
+                if url:
+                    name = get_image_name(image_name=name)
+                    data = {
+                        'buildid': result[0]['task_id'],
+                        'image_url': url,
+                        'name': name,
+                        'release': release,
+                    }
+                    image_files.append(data)
+
+        return image_files
+
+    def consume(self, msg):
+        """ This is called when we receive a message matching the topic. """
+
+        builds = list()  # These will be the Koji build IDs to upload, if any.
+
+        msg_info = msg["body"]["msg"]["info"]
+
+        log.info('Received %r %r' % (msg['topic'], msg['body']['msg_id']))
+
+        # If the build method is "image", we check to see if the child
+        # task's method is "createImage".
+        if msg_info["method"] == "image":
+            if isinstance(msg_info["children"], list):
+                for child in msg_info["children"]:
+                    if child["method"] == "createImage":
+                        # We only care about the image if the build
+                        # completed successfully (with state code 2).
+                        if child["state"] == 2:
+                            builds.append(child["id"])
+
+        if len(builds) > 0:
+            produce_jobs(self._get_tasks(builds))
diff --git a/roles/autocloud/backend/tasks/main.yml b/roles/autocloud/backend/tasks/main.yml
index 77bd0ec269..7ea2266a18 100644
--- a/roles/autocloud/backend/tasks/main.yml
+++ b/roles/autocloud/backend/tasks/main.yml
@@ -59,6 +59,20 @@
   - autocloud
   - autocloud/backend
 
+#
+# install koji build fedmsg hotfix
+# See issue https://github.com/kushaldas/autocloud/issues/34
+#
+- name: hotfix - copy over consumer for autocloud
+  copy: src="{{ files }}/hotfix/autocloud/consumer.py" dest=/usr/lib/python2.7/site-packages/autocloud
+          owner=root group=root mode=0644
+  notify:
+  - restart fedmsg-hub
+  tags:
+  - autocloud
+  - hotfix
+  - autocloud/backend
+
 - name: install vagrant-libvirt for the libvirt host
   dnf: pkg={{ item }} state=present
   with_items: