diff --git a/openstack/mistral/mistral.spec.j2 b/openstack/mistral/mistral.spec.j2
index 0fd9d7823..d56124d3f 100644
--- a/openstack/mistral/mistral.spec.j2
+++ b/openstack/mistral/mistral.spec.j2
@@ -12,7 +12,7 @@ Summary:        Workflow Service for OpenStack cloud
 License:        {{ license('Apache-2.0') }}
 Group:          Development/Libraries
 URL:            https://launchpad.net/mistral
-Source0:        {{ source|basename }}
+Source0:        {{ source }}
 Source1:        mistral-api.service
 Source2:        mistral-engine.service
 Source3:        mistral-executor.service
@@ -72,6 +72,7 @@ BuildRequires:  {{ py2pkg('tooz') }}
 BuildRequires:  {{ py2pkg('python-troveclient') }}
 BuildRequires:  {{ py2pkg('unittest2') }}
 BuildRequires:  {{ py2pkg('python-vitrageclient') }}
+BuildRequires:  {{ py2pkg('zake') }}
 BuildRequires:  {{ py2pkg('python-zaqarclient') }}
 BuildRequires:  {{ py2pkg('python-zunclient') }}
 Requires:       python-mistral = %{version}-%{release}
diff --git a/openstack/tooz/0001-Remove-grpcio-from-requirements.txt.patch b/openstack/tooz/0001-Remove-grpcio-from-requirements.txt.patch
new file mode 100644
index 000000000..8b8977c68
--- /dev/null
+++ b/openstack/tooz/0001-Remove-grpcio-from-requirements.txt.patch
@@ -0,0 +1,24 @@
+From 9c2807281be01c28643471ebe9f9ef3d40b4c2c5 Mon Sep 17 00:00:00 2001
+From: Thomas Bechtold <tbechtold@suse.com>
+Date: Mon, 4 Mar 2019 10:17:07 +0100
+Subject: [PATCH] Remove grpcio from requirements.txt
+
+It is not used anywhere.
+
+Change-Id: I0a0215f56b37d9a4286097b7f748f68d59afcb35
+---
+ requirements.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index b2aee6d..1af5228 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -13,4 +13,3 @@ futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD
+ futurist>=1.2.0 # Apache-2.0
+ oslo.utils>=3.15.0 # Apache-2.0
+ oslo.serialization>=1.10.0 # Apache-2.0
+-grpcio>=1.0.0,<1.16.0
+-- 
+2.21.0
+
diff --git a/openstack/tooz/tooz.spec.j2 b/openstack/tooz/tooz.spec.j2
index 6c79853ce..ec96d5d1f 100644
--- a/openstack/tooz/tooz.spec.j2
+++ b/openstack/tooz/tooz.spec.j2
@@ -10,6 +10,8 @@ License:        {{ license('Apache-2.0') }}
 Group:          Development/Languages/Python
 URL:            https://docs.openstack.org/developer/tooz/
 Source0:        https://files.pythonhosted.org/packages/source/t/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+# https://review.openstack.org/#/c/640695/
+Patch1:         0001-Remove-grpcio-from-requirements.txt.patch
 BuildRequires:  memcached
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py2pkg('devel') }}