diff --git a/bluez.changes b/bluez.changes
index 54768da..7076d35 100644
--- a/bluez.changes
+++ b/bluez.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Feb 20 20:22:38 UTC 2019 - Stefan Seyfried <seife+obs@b1-systems.com>
+
+- use gcc8 for now to work around boo#1121404
+
+-------------------------------------------------------------------
+Sat Feb  2 13:35:50 UTC 2019 - Stefan Seyfried <seife+obs@b1-systems.com>
+
+- add btmgmt to bluez-test
+
 -------------------------------------------------------------------
 Tue Jan 15 09:05:19 UTC 2019 - seife+obs@b1-systems.com
 
diff --git a/bluez.spec b/bluez.spec
index c373b90..429400a 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -43,6 +43,12 @@ Patch6:         disable_some_obex_tests.patch
 # fix some memory leak with malformed packet (reported upstream but not yet fixed)
 Patch101:       CVE-2016-9800-tool-hcidump-Fix-memory-leak-with-malformed-packet.patch
 Patch102:       CVE-2016-9804-tool-hcidump-Fix-memory-leak-with-malformed-packet.patch
+
+# workaround for gcc9 problem, boo#1121404
+%if 0%{?suse_version} >= 1550
+BuildRequires:  gcc8
+%define gcc_suf -8
+%endif
 BuildRequires:  automake
 BuildRequires:  flex
 BuildRequires:  libtool
@@ -164,6 +170,7 @@ sed -i "/SystemdService=.*/d" obexd/src/org.bluez.obex.service
 echo AutoEnable=true >> src/main.conf
 
 %build
+export CC=gcc%{?gcc_suf}
 # because of patch4...
 autoreconf -fi
 # --enable-experimental is needed or btattach does not build (bug?)
@@ -186,6 +193,7 @@ autoreconf -fi
 make %{?_smp_mflags} all
 
 %install
+export CC=gcc%{?gcc_suf}
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 install --mode=0644 -D %{SOURCE7} %{buildroot}/%{_sysconfdir}/modprobe.d/50-bluetooth.conf
@@ -204,6 +212,8 @@ install -m0755 attrib/gatttool %{buildroot}%{_bindir}
 ## install btgatt-client for -test package, see
 ## https://www.spinics.net/lists/linux-bluetooth/msg63258.html
 install -m0755 tools/btgatt-client %{buildroot}%{_bindir}
+# btmgmt can be useful
+install -m0755 tools/btmgmt %{buildroot}%{_bindir}
 
 # for auto-enable subpackage
 find . -name main.conf
@@ -218,6 +228,7 @@ sed -i -e '1s/env p/p/' %{buildroot}%{_libdir}/bluez/test/example-gatt-{client,s
 
 %check
 %if ! 0%{?qemu_user_space_build}
+export CC=gcc%{?gcc_suf}
 ##make %%{?_smp_mflags} check
 # deliberately not running parallel, as the test suite has spurious failures otherwise
 make check V=0
@@ -317,6 +328,7 @@ make check V=0
 %{_bindir}/l2test
 %{_bindir}/rctest
 %{_bindir}/btgatt-client
+%{_bindir}/btmgmt
 %dir %{_libdir}/bluez
 %{_libdir}/bluez/test