diff --git a/mbs-1.3.20-mock.patch b/mbs-1.3.20-mock.patch
new file mode 100644
index 0000000..b280c0d
--- /dev/null
+++ b/mbs-1.3.20-mock.patch
@@ -0,0 +1,30 @@
+diff --git a/conf/config.py b/conf/config.py
+index 0dc82f3..6cc5328 100644
+--- a/conf/config.py
++++ b/conf/config.py
+@@ -33,7 +33,7 @@ class BaseConfiguration(object):
+     KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos'
+     KOJI_TAG_PREFIXES = ['module']
+     COPR_CONFIG = '/etc/module-build-service/copr.conf'
+-    PDC_URL = 'http://modularity.fedorainfracloud.org:8080/rest_api/v1'
++    PDC_URL = 'http://pdc.fedoraproject.org/rest_api/v1'
+     PDC_INSECURE = True
+     PDC_DEVELOP = True
+     SCMURLS = ["git://pkgs.stg.fedoraproject.org/modules/"]
+diff --git a/module_build_service/builder/__init__.py b/module_build_service/builder/__init__.py
+index 99c3c8b..d28d06f 100644
+--- a/module_build_service/builder/__init__.py
++++ b/module_build_service/builder/__init__.py
+@@ -9,9 +9,9 @@ __all__ = [
+ 
+ GenericBuilder.register_backend_class(KojiModuleBuilder)
+ 
+-if conf.system == "mock":
+-    from MockModuleBuilder import MockModuleBuilder
+-    GenericBuilder.register_backend_class(MockModuleBuilder)
++#if conf.system == "mock":
++from MockModuleBuilder import MockModuleBuilder
++GenericBuilder.register_backend_class(MockModuleBuilder)
+ 
+ if conf.system == "copr":
+     from CoprModuleBuilder import CoprModuleBuilder
diff --git a/module-build-service.spec b/module-build-service.spec
index ce997f5..b8666bb 100644
--- a/module-build-service.spec
+++ b/module-build-service.spec
@@ -1,12 +1,13 @@
 Name:		module-build-service
 Version:	1.3.20
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The Module Build Service for Modularity
 
 Group:		Development/Tools
 License:	MIT
 URL:		https://pagure.io/fm-orchestrator
 Source0:	https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz
+Patch0: mbs-1.3.20-mock.patch
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
 # In EL7 we need flask which needs python-itsdangerous which comes from
@@ -118,6 +119,8 @@ for a number of tasks:
 %prep
 %setup -q
 
+%patch0 -p1
+
 # Simply remove an old .pyc file that was included in one release.
 rm -f module_build_service/scheduler/consumer.pyc
 # And this weird sqlite file that made it in...
@@ -166,6 +169,9 @@ done
 
 
 %changelog
+* Wed Apr 12 2017 Jan Kaluza <jkaluza@redhat.com> - 1.3.20-3
+- fix mock backend issues
+
 * Mon Apr 10 2017 Jan Kaluza <jkaluza@redhat.com> - 1.3.20-2
 - add missing dependencies for mbs-build