diff --git a/mbs-macros-repo-regen.patch b/mbs-macros-repo-regen.patch
new file mode 100644
index 0000000..77b2e45
--- /dev/null
+++ b/mbs-macros-repo-regen.patch
@@ -0,0 +1,31 @@
+diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py
+index 363bff6..0249be3 100644
+--- a/module_build_service/scheduler/handlers/modules.py
++++ b/module_build_service/scheduler/handlers/modules.py
+@@ -292,16 +292,13 @@ def wait(config, session, msg):
+     session.add(build)
+     session.commit()
+ 
+-    # If this build already exists and is done, then regenerate the repository
+-    # to ensure module-build-macros is there.
+-    if state == koji.BUILD_STATES['COMPLETE']:
+-        if config.system == "koji":
+-            log.info("module-build-macros is already built. "
+-                "Regenerating the repo.")
+-            task_id = builder.koji_session.newRepo(
+-                builder.module_build_tag['name'])
+-            build.new_repo_task_id = task_id
+-            session.commit()
+-        else:
+-            return [module_build_service.messaging.KojiRepoChange(
+-                'fake msg', builder.module_build_tag['name'])]
++    # We always have to regenerate the repository.
++    if config.system == "koji":
++        log.info("Regenerating the repository")
++        task_id = builder.koji_session.newRepo(
++            builder.module_build_tag['name'])
++        build.new_repo_task_id = task_id
++        session.commit()
++    else:
++        return [module_build_service.messaging.KojiRepoChange(
++            'fake msg', builder.module_build_tag['name'])]
diff --git a/module-build-service.spec b/module-build-service.spec
index 30f4cd3..9de8915 100644
--- a/module-build-service.spec
+++ b/module-build-service.spec
@@ -1,6 +1,6 @@
 Name:		module-build-service
 Version:	1.3.25
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	The Module Build Service for Modularity
 
 
@@ -13,6 +13,7 @@ Patch0:     mbs-no-mbsbuild.patch
 %endif
 Patch1:     mbs-empty-server-name.patch
 Patch2:     mbs-cg-upload.patch
+Patch3:     mbs-macros-repo-regen.patch
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
 # In EL7 we need flask which needs python-itsdangerous which comes from
@@ -174,6 +175,7 @@ for a number of tasks:
 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Simply remove an old .pyc file that was included in one release.
 rm -f module_build_service/scheduler/consumer.pyc
@@ -224,6 +226,9 @@ done
 
 
 %changelog
+* Mon Aug 07 2017 Jan Kaluza <jkaluza@redhat.com> - 1.3.25-8
+- do not wait for kojira when generating module-build-macros repository
+
 * Mon Aug 07 2017 Jan Kaluza <jkaluza@redhat.com> - 1.3.25-7
 - upload modulemd.yaml to Koji as modulemd.txt