diff --git a/gdb-rpmlintrc b/gdb-rpmlintrc
index 8b88cb5..0abda80 100644
--- a/gdb-rpmlintrc
+++ b/gdb-rpmlintrc
@@ -4,3 +4,13 @@ from Config import *
 # The testresult logs contain part of the build log and thus
 # necessarily mention the buildroot
 addFilter ("gdb-testresults.*file-contains-buildroot")
+
+# Historically libinproctrace was always in gdbserver.  It's
+# LD_PRELOADed into processes, so there are no direct ELF
+# dependencies to it.  It's required on the remote side (where
+# gdbserver is) so it makes sense to put it in the same package.
+# This never was a problem for rpmlint before because libinproctrace
+# had no SONAME, so the check wasn't active.  Now it has, so it's checked
+# and because the gdbserver binary has no direct ELF visible dependency
+# it's thought to be necessary to follow shlib policy.  That's not the case.
+addFilter ("gdbserver.*shlib-policy-name-error.*libinproctrace")
diff --git a/gdb.changes b/gdb.changes
index b44cd1d..70c8489 100644
--- a/gdb.changes
+++ b/gdb.changes
@@ -14,6 +14,7 @@ Wed Feb 15 15:55:11 UTC 2017 - matz@suse.com
     - new-ui: create new user interface for GUI clients
   * (fast) tracepoints on s390x and ppc64le added to gdbserver
   * New target Andes NDS32
+- Add rpmlint exception for historic libinproctrace place
 - Remove obsolete patches:
   gdb-aarch64-v81-hwbreakpoints.diff
   gdb-bare-DW_TAG_lexical_block-1of2.patch
diff --git a/gdb.spec b/gdb.spec
index 79cc46d..03ad067 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -232,6 +232,8 @@ Patch1005:      gdb-7.10-swo18929.patch
 
 BuildRequires:  bison
 BuildRequires:  flex
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  glibc-devel
 %if 0%{suse_version} > 1110
@@ -282,8 +284,6 @@ ExclusiveArch:  noarch i386 x86_64 ppc ppc64 ia64 s390 s390x
 BuildRequires:  dejagnu
 BuildRequires:  sharutils
 # gcc-objc++ is not covered by the GDB testsuite.
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
 BuildRequires:  gcc-fortran
 %if 0%{?gcc_version} < 7
 BuildRequires:  gcc-java
@@ -554,6 +554,11 @@ mkdir %{gdb_build}$fprofile
 cd %{gdb_build}$fprofile
 
 export CFLAGS="$RPM_OPT_FLAGS"
+
+# FIXME: gcc-7 compatibility.
+CFLAGS="$CFLAGS -Wno-implicit-fallthrough"
+export CXXFLAGS="$CFLAGS"
+
 export LIBRPM=no
 if test -f /usr/%{_lib}/librpm.so.1; then
   export LIBRPM=librpm.so.1