diff --git a/0001-Expand-compatible-arches-when-gathering-from-modules.patch b/0001-Expand-compatible-arches-when-gathering-from-modules.patch
new file mode 100644
index 00000000..ef1a2d97
--- /dev/null
+++ b/0001-Expand-compatible-arches-when-gathering-from-modules.patch
@@ -0,0 +1,44 @@
+From 01607602c699a79c322627a69669c5bc3874abfe Mon Sep 17 00:00:00 2001
+From: Ralph Bean <rbean@redhat.com>
+Date: Wed, 12 Apr 2017 14:31:40 -0400
+Subject: [PATCH] Expand compatible arches when gathering from modules.
+
+Fixes #596.
+
+Signed-off-by: Ralph Bean <rbean@redhat.com>
+---
+ pungi/phases/gather/sources/source_module.py | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/pungi/phases/gather/sources/source_module.py b/pungi/phases/gather/sources/source_module.py
+index dd7eaff..93c7169 100644
+--- a/pungi/phases/gather/sources/source_module.py
++++ b/pungi/phases/gather/sources/source_module.py
+@@ -19,7 +19,7 @@ Get a package list based on modulemd metadata loaded in pkgset phase.
+ """
+ 
+ 
+-from pungi.wrappers.comps import CompsWrapper
++import pungi.arch
+ import pungi.phases.gather.source
+ import kobo.rpmlib
+ 
+@@ -31,9 +31,13 @@ class GatherSourceModule(pungi.phases.gather.source.GatherSourceBase):
+         groups = set()
+         packages = set()
+ 
++        compatible_arches = pungi.arch.get_compatible_arches(arch)
++
+         if variant is not None and variant.modules:
+-            rpms = variant.pkgset.rpms_by_arch[arch] + \
+-                variant.pkgset.rpms_by_arch["noarch"]
++            rpms = sum([
++                variant.pkgset.rpms_by_arch.get(a, [])
++                for a in compatible_arches
++            ], [])
+             for rpm_obj in rpms:
+                 for mmd in variant.mmds:
+                     srpm = kobo.rpmlib.parse_nvr(rpm_obj.sourcerpm)["name"]
+-- 
+2.9.3
+
diff --git a/pungi.spec b/pungi.spec
index 70b2ade1..f041530a 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -1,6 +1,6 @@
 Name:           pungi
 Version:        4.1.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Distribution compose tool
 
 Group:          Development/Tools
@@ -8,6 +8,7 @@ License:        GPLv2
 URL:            https://pagure.io/pungi
 Source0:        https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:         0001-Fix-createrepo-issue-for-modular-compose-when-multip.patch
+Patch1:         0001-Expand-compatible-arches-when-gathering-from-modules.patch
 
 BuildRequires:  python-nose, python-mock
 BuildRequires:  python-devel, python-setuptools, python2-productmd >= 1.3
@@ -76,6 +77,7 @@ notification to Fedora Message Bus.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -120,6 +122,9 @@ cd tests && ./test_compose.sh
 %{_bindir}/%{name}-compare-depsolving
 
 %changelog
+* Thu Apr 13 2017 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.14-3
+- Expand compatible arches when gathering from modules
+
 * Tue Apr 11 2017 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.14-2
 - Fix createrepo issue for modular compose