diff --git a/emacs.changes b/emacs.changes
index 0ce2d57..97d4d8e 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep 21 06:31:44 UTC 2016 - werner@suse.de
+
+- Diable experimental cairo support as it cause trouble with spacemacs
+  as well as with the w3 mode 
+
 -------------------------------------------------------------------
 Mon Sep 19 15:01:07 UTC 2016 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 85a95a5..53fc1dd 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -17,6 +17,8 @@
 
 
 %bcond_with     autoconf
+# Experimental, not for production (see https://www.gnu.org/software/emacs/news/NEWS.25.1)
+%bcond_with     cairo
 
 Name:           emacs
 BuildRequires:  ImageMagick
@@ -26,7 +28,7 @@ BuildRequires:  autoconf
 BuildRequires:  automake
 %endif
 BuildRequires:  alsa-devel
-%if 0%{?suse_version} > 1130
+%if %{with cairo} && 0%{?suse_version} > 1130
 BuildRequires:  cairo-devel
 %endif
 BuildRequires:  dbus-1-devel
@@ -354,17 +356,15 @@ DESKTOP="--with-x \
     GTK="${DESKTOP} \
 %if 0%{?suse_version} > 1130
 	 --with-x-toolkit=gtk3 \
+	 --with-xwidgets \
 %else
 	 --with-x-toolkit=gtk2 \
-%endif
-%if 0%{?suse_version} > 1320
-	 --with-xwidgets \
 %endif
 	 --x-includes=%{_x11inc} \
 	 --x-libraries=%{_x11lib} \
 	 --with-libotf \
 	 --with-m17n-flt \
-%if 0%{?suse_version} > 1130
+%if %{with cairo} && 0%{?suse_version} > 1130
 	 --with-cairo \
 %endif
 "