diff --git a/abook.changes b/abook.changes
index 47aacd2..837997b 100644
--- a/abook.changes
+++ b/abook.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 18 21:16:15 UTC 2015 - crrodriguez@opensuse.org
+
+- Force GnU inline semantics, fix build with GCC5
+- Do not use fstack-protector-all, but the builsystem default.
+
 -------------------------------------------------------------------
 Fri Dec  9 14:23:24 UTC 2011 - coolo@suse.com
 
diff --git a/abook.spec b/abook.spec
index 2cda461..c214e83 100644
--- a/abook.spec
+++ b/abook.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package abook
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           abook
 BuildRequires:  gettext
 BuildRequires:  ncurses-devel
@@ -39,8 +40,9 @@ use with mutt mail client.
 %patch0 -p1
 
 %build
+export CFLAGS="%{optflags} -fgnu89-inline"
 %configure
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fstack-protector-all" %{?_smp_mflags}
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 %makeinstall