diff --git a/gdb.spec b/gdb.spec
index aadf8a8..162376b 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -26,7 +26,7 @@ Version: 8.2.50.%{snapsrc}
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
 Group: Development/Debuggers
@@ -566,6 +566,8 @@ export CXXFLAGS="$CFLAGS"
 	--with-separate-debug-dir=/usr/lib/debug		\
 	--disable-sim						\
 	--disable-rpath						\
+	--without-stage1-ldflags				\
+	--disable-libmcheck					\
 %if 0%{!?rhel:1} || 0%{?rhel} > 7
 	--with-babeltrace					\
 	--with-guile						\
@@ -1022,6 +1024,11 @@ fi
 %endif
 
 %changelog
+* Thu Oct  4 2018 Jan Kratochvil <jan.kratochvil@redhat.com> - 8.2.50.20180917-3.fc30
+- Fix annobin complaints (RH BZ 1630564):
+  --without-stage1-ldflags: Disable static libstdc++ and libgcc linking.
+  --disable-libmcheck: That is a distro-level decision, not package decision.
+
 * Wed Sep 19 2018 Sergio Durigan Junior <sergiodj@redhat.com> - 8.2.50.20180917-2.fc30
 - Remove 'gdb-6.5-bz203661-emit-relocs.patch'.
 - Update changelog entry for last release.