diff --git a/python-gsw.changes b/python-gsw.changes
index 374498d..9b69448 100644
--- a/python-gsw.changes
+++ b/python-gsw.changes
@@ -1,8 +1,15 @@
+-------------------------------------------------------------------
+Wed Feb 20 14:27:16 CET 2019 - Matej Cepl <mcepl@suse.com>
+
+- Actually gh#TEOS-10/GSW-Python#40 can be worked around by
+  adding -ffloat-store to CFLAGS. Which I do now for i586 and
+  armv7l platforms.
+
 -------------------------------------------------------------------
 Thu Jul 26 13:56:17 UTC 2018 - mcepl@suse.com
 
 - Switch off test_check_function[cfcf71], which fails on 32bit archs
-  (https://github.com/TEOS-10/GSW-Python/issues/40).
+  (gh#TEOS-10/GSW-Python#40).
 
 -------------------------------------------------------------------
 Thu Jul 26 13:21:09 UTC 2018 - mcepl@suse.com
diff --git a/python-gsw.spec b/python-gsw.spec
index 54b5caa..8247289 100644
--- a/python-gsw.spec
+++ b/python-gsw.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-gsw
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -32,7 +32,7 @@ License:        MIT AND BSD-3-Clause
 Group:          Development/Languages/Python
 URL:            https://github.com/TEOS-10/GSW-python
 Source0:        https://files.pythonhosted.org/packages/source/g/gsw/gsw-%{version}.tar.gz
-# https://github.com/TEOS-10/GSW-Python/issues/39
+# gh#TEOS-10/GSW-Python#39
 Source1:        tests.tar.gz
 BuildRequires:  %{python_module devel >= 3.5}
 BuildRequires:  %{python_module numpy-devel}
@@ -53,17 +53,21 @@ Seawater 2010 (TEOS-10).
 tar xf %{SOURCE1}
 
 %build
-export CFLAGS="%{optflags}"
+CFLAGS="%{optflags}"
+%ifarch i586 armv7l
+CFLAGS="$CFLAGS -ffloat-store"
+%endif
+export CFLAGS
 %python_build
 
 %install
 %python_install
 %{python_expand %fdupes %{buildroot}%{$python_sitearch}}
 
-# https://github.com/TEOS-10/GSW-Python/issues/40
+# gh#TEOS-10/GSW-Python#40
 %check
 %{python_expand export PYTHONPATH=%{buildroot}%{python_sitearch}
-py.test-%{$python_bin_suffix} -k 'not test_check_function[cfcf71]'
+py.test-%{$python_bin_suffix} -v
 }
 
 %files %{python_files}