diff --git a/gd.changes b/gd.changes
index c608594..286f174 100644
--- a/gd.changes
+++ b/gd.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Dec  9 17:09:40 UTC 2016 - pgajdos@suse.com
+
+- devel package also require libwebp-devel
+
+-------------------------------------------------------------------
+Thu Dec  8 14:33:22 UTC 2016 - crrodriguez@opensuse.org
+
+- Support webp format, BuildRequires libwebp-devel 
+
+-------------------------------------------------------------------
+Thu Dec  8 14:20:54 UTC 2016 - crrodriguez@opensuse.org
+
+- Honour %optflags correctly.
+
 -------------------------------------------------------------------
 Fri Sep 30 14:59:25 UTC 2016 - badshah400@gmail.com
 
diff --git a/gd.spec b/gd.spec
index d70a414..1663538 100644
--- a/gd.spec
+++ b/gd.spec
@@ -49,6 +49,7 @@ BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libtool
+BuildRequires:  libwebp-devel
 BuildRequires:  pkg-config
 BuildRequires:  xorg-x11-libX11-devel
 BuildRequires:  xorg-x11-libXau-devel
@@ -82,6 +83,7 @@ Requires:       glibc-devel
 Requires:       libpng-devel
 Requires:       libtiff-devel
 Requires:       libvpx-devel
+Requires:       libwebp-devel
 Requires:       zlib-devel
 
 %description devel
@@ -105,10 +107,11 @@ autoreconf -fiv
 
 # ADDITIONAL CFLAGS ARE NEEDED TO FIX TEST FAILURES IN CASE OF i586, BUT HARMLESS TO APPLY GENERALLY FOR ALL ix86
 %ifarch %{ix86}
-CFLAGS="$CFLAGS -msse -mfpmath=sse"
-export CFLAGS
+export CFLAGS="%optflags -msse -mfpmath=sse"
 %else
-CFLAGS="$CFLAGS -ffp-contract=off"
+%ifnarch x86_64
+export CFLAGS="%optflags -ffp-contract=off"
+%endif
 %endif
 
 # without-x -- useless switch which just mangles cflags