diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-aarch64-gcc7.changes
+++ b/cross-aarch64-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-arm-gcc7.changes
+++ b/cross-arm-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-avr-gcc7.changes
+++ b/cross-avr-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes
index 2f20c8f..bfbff66 100644
--- a/cross-epiphany-gcc7-bootstrap.changes
+++ b/cross-epiphany-gcc7-bootstrap.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-epiphany-gcc7.changes
+++ b/cross-epiphany-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-hppa-gcc7.changes
+++ b/cross-hppa-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-i386-gcc7.changes
+++ b/cross-i386-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-m68k-gcc7.changes
+++ b/cross-m68k-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-mips-gcc7.changes
+++ b/cross-mips-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-nvptx-gcc7.changes
+++ b/cross-nvptx-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-ppc64-gcc7.changes
+++ b/cross-ppc64-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-ppc64le-gcc7.changes
+++ b/cross-ppc64le-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes
index 2f20c8f..bfbff66 100644
--- a/cross-rx-gcc7-bootstrap.changes
+++ b/cross-rx-gcc7-bootstrap.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-rx-gcc7.changes
+++ b/cross-rx-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-s390x-gcc7.changes
+++ b/cross-s390x-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-sparc-gcc7.changes
+++ b/cross-sparc-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-sparc64-gcc7.changes
+++ b/cross-sparc64-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/cross-x86_64-gcc7.changes
+++ b/cross-x86_64-gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/gcc.spec.in b/gcc.spec.in
index 5c85b2c..a0f055f 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -269,8 +269,10 @@ Requires: libitm%{libitm_sover} >= %{version}-%{release}
 Requires: libcilkrts%{libcilkrts_sover} >= %{version}-%{release}
 %endif
 %ifarch %lsan_arch
+%if %{build_primary_64bit}
 Requires: liblsan%{liblsan_sover} >= %{version}-%{release}
 %endif
+%endif
 %ifarch %ubsan_arch
 Requires: libubsan%{libubsan_sover} >= %{version}-%{release}
 %endif
@@ -338,13 +340,6 @@ Requires: libitm%{libitm_sover}-32bit >= %{version}-%{release}
 %ifarch %cilkrts_arch
 Requires: libcilkrts%{libcilkrts_sover}-32bit >= %{version}-%{release}
 %endif
-# lsan on x86_64 has no multilib
-%ifarch x86_64
-%else
-%ifarch %lsan_arch
-Requires: liblsan%{liblsan_sover} >= %{version}-%{release}
-%endif
-%endif
 %ifarch %ubsan_arch
 Requires: libubsan%{libubsan_sover}-32bit >= %{version}-%{release}
 %endif
diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes
index 2f20c8f..bfbff66 100644
--- a/gcc7-testresults.changes
+++ b/gcc7-testresults.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec
index a54fc0b..ae08cba 100644
--- a/gcc7-testresults.spec
+++ b/gcc7-testresults.spec
@@ -281,8 +281,10 @@ Requires:       libitm%{libitm_sover} >= %{version}-%{release}
 Requires:       libcilkrts%{libcilkrts_sover} >= %{version}-%{release}
 %endif
 %ifarch %lsan_arch
+%if %{build_primary_64bit}
 Requires:       liblsan%{liblsan_sover} >= %{version}-%{release}
 %endif
+%endif
 %ifarch %ubsan_arch
 Requires:       libubsan%{libubsan_sover} >= %{version}-%{release}
 %endif
diff --git a/gcc7.changes b/gcc7.changes
index 2f20c8f..bfbff66 100644
--- a/gcc7.changes
+++ b/gcc7.changes
@@ -2,6 +2,7 @@
 Mon Mar 27 14:06:43 UTC 2017 - rguenther@suse.com
 
 - Really fix libtsan requirement on ppc.  [boo#1030623]
+- Also fix liblsan requirement on pcc.
 
 -------------------------------------------------------------------
 Thu Mar 23 09:59:21 UTC 2017 - rguenther@suse.com
diff --git a/gcc7.spec b/gcc7.spec
index 437ae09..ebded5f 100644
--- a/gcc7.spec
+++ b/gcc7.spec
@@ -263,8 +263,10 @@ Requires:       libitm%{libitm_sover} >= %{version}-%{release}
 Requires:       libcilkrts%{libcilkrts_sover} >= %{version}-%{release}
 %endif
 %ifarch %lsan_arch
+%if %{build_primary_64bit}
 Requires:       liblsan%{liblsan_sover} >= %{version}-%{release}
 %endif
+%endif
 %ifarch %ubsan_arch
 Requires:       libubsan%{libubsan_sover} >= %{version}-%{release}
 %endif
@@ -329,13 +331,6 @@ Requires:       libitm%{libitm_sover}-32bit >= %{version}-%{release}
 %ifarch %cilkrts_arch
 Requires:       libcilkrts%{libcilkrts_sover}-32bit >= %{version}-%{release}
 %endif
-# lsan on x86_64 has no multilib
-%ifarch x86_64
-%else
-%ifarch %lsan_arch
-Requires:       liblsan%{liblsan_sover} >= %{version}-%{release}
-%endif
-%endif
 %ifarch %ubsan_arch
 Requires:       libubsan%{libubsan_sover}-32bit >= %{version}-%{release}
 %endif