diff --git a/Mesa.changes b/Mesa.changes
index b636fad..3ea0e54 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 14 17:16:34 UTC 2017 - jberry@suse.com
+
+- Replace uses of arch directive with targettype within a package
+  declaration to resolve incorrect dependencies placed on -32bit
+  packages.
+
 -------------------------------------------------------------------
 Mon Aug 14 14:06:35 UTC 2017 - msrb@suse.com
 
diff --git a/baselibs.conf b/baselibs.conf
index 86a8386..92d0301 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -55,9 +55,12 @@ libOSMesa-devel
 libgbm1
 libgbm-devel
 	requires "libgbm1-<targettype> = <version>"
-arch aarch64 ppc64 ppc64le s390x x86_64 package libwayland-egl1
-arch aarch64 ppc64 ppc64le s390x x86_64 package libwayland-egl-devel
-	requires "libwayland-egl1-<targettype> = <version>"
+libwayland-egl-devel
+	targetarch aarch64 requires "libwayland-egl1-<targettype> = <version>"
+	targetarch ppc64 requires "libwayland-egl1-<targettype> = <version>"
+	targetarch ppc64le requires "libwayland-egl1-<targettype> = <version>"
+	targetarch s390x requires "libwayland-egl1-<targettype> = <version>"
+	targetarch x86_64 requires "libwayland-egl1-<targettype> = <version>"
 Mesa-libglapi0
 Mesa-libglapi-devel
 	requires "Mesa-libglapi0-<targettype> = <version>"
@@ -65,13 +68,29 @@ Mesa-libd3d
 	provides "d3dadapter9.so.1"
 Mesa-libd3d-devel
 	requires "Mesa-libd3d-<targettype> = <version>"
-arch aarch64 ppc64 ppc64le s390x x86_64 package libvulkan_intel
-	+/usr/share/vulkan/icd.d/intel_icd.*.json
-arch aarch64 ppc64 ppc64le s390x x86_64 package libvulkan_radeon
-	+/usr/share/vulkan/icd.d/radeon_icd.*.json
-arch aarch64 ppc64 ppc64le s390x x86_64 package Mesa-libVulkan-devel
-	requires "libvulkan_intel-<targettype> = <version>"
-	requires "libvulkan_radeon-<targettype> = <version>"
+libvulkan_intel
+	targetarch aarch64 +/usr/share/vulkan/icd.d/intel_icd.*.json
+	targetarch ppc64 +/usr/share/vulkan/icd.d/intel_icd.*.json
+	targetarch ppc64le +/usr/share/vulkan/icd.d/intel_icd.*.json
+	targetarch s390x +/usr/share/vulkan/icd.d/intel_icd.*.json
+	targetarch x86_64 +/usr/share/vulkan/icd.d/intel_icd.*.json
+libvulkan_radeon
+	targetarch aarch64 +/usr/share/vulkan/icd.d/radeon_icd.*.json
+	targetarch ppc64 +/usr/share/vulkan/icd.d/radeon_icd.*.json
+	targetarch ppc64le +/usr/share/vulkan/icd.d/radeon_icd.*.json
+	targetarch s390x +/usr/share/vulkan/icd.d/radeon_icd.*.json
+	targetarch x86_64 +/usr/share/vulkan/icd.d/radeon_icd.*.json
+Mesa-libVulkan-devel
+	targetarch aarch64 requires "libvulkan_intel-<targettype> = <version>"
+	targetarch aarch64 requires "libvulkan_radeon-<targettype> = <version>"
+	targetarch ppc64 requires "libvulkan_intel-<targettype> = <version>"
+	targetarch ppc64 requires "libvulkan_radeon-<targettype> = <version>"
+	targetarch ppc64le requires "libvulkan_intel-<targettype> = <version>"
+	targetarch ppc64le requires "libvulkan_radeon-<targettype> = <version>"
+	targetarch s390x requires "libvulkan_intel-<targettype> = <version>"
+	targetarch s390x requires "libvulkan_radeon-<targettype> = <version>"
+	targetarch x86_64 requires "libvulkan_intel-<targettype> = <version>"
+	targetarch x86_64 requires "libvulkan_radeon-<targettype> = <version>"
 libXvMC_nouveau
 libXvMC_r600
 libvdpau_nouveau
@@ -79,5 +98,4 @@ libvdpau_r300
 libvdpau_r600
 libvdpau_radeonsi
 libwayland-egl1
-arch aarch64 ppc64 ppc64le s390x x86_64 package Mesa-libOpenCL
 Mesa-dri-nouveau