diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 75b61f0..f116e0d 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,10 @@
+%ifnarch s390 s390x
+%global with_wacom 1
+%endif
+
 Name:           gnome-settings-daemon
 Version:        3.3.91
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -11,6 +15,8 @@ Source:         http://download.gnome.org/sources/%{name}/3.3/%{name}-%{version}
 
 # Fedora specific patch
 Patch0: gsd-calculator.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=672576
+Patch1: gnome-settings-daemon-3.3.91-wacom.patch
 
 Requires: control-center-filesystem
 
@@ -39,10 +45,12 @@ BuildRequires:  nss-devel
 BuildRequires:  colord-devel >= 0.1.12
 BuildRequires:  lcms2-devel >= 2.2
 BuildRequires:  libXi-devel libXfixes-devel
-BuildRequires:  libwacom-devel
 BuildRequires:  systemd-devel
 BuildRequires:  libXtst-devel
+%if 0%{?with_wacom}
+BuildRequires:  libwacom-devel
 BuildRequires:  xorg-x11-drv-wacom-devel
+%endif
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -61,6 +69,7 @@ developing applications that use %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .calc
+%patch1 -p1 -b .wacom
 
 autoreconf -i -f
 
@@ -68,7 +77,13 @@ autoreconf -i -f
 %configure --disable-static \
            --enable-profiling \
            --enable-packagekit \
-           --enable-systemd
+           --enable-systemd \
+%if ! 0%{?with_wacom}
+          --disable-wacom
+%else
+          %{nil}
+%endif
+
 make %{?_smp_mflags}
 
 
@@ -151,12 +166,15 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/gnome-settings-daemon-3.0/libupdates.so
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
 
+%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml
+
+%if 0%{?with_wacom}
 %{_libdir}/gnome-settings-daemon-3.0/wacom.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/libgsdwacom.so
-%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.wacom.gschema.xml
 %{_libexecdir}/gsd-wacom-led-helper
 %{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.wacom.policy
+%endif
 
 %{_libdir}/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/libxrandr.so
@@ -208,6 +226,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gnome-settings-daemon-3.0/input-device-example.sh
 
 %changelog
+* Wed Mar 21 2012 Dan Horák <dan[at]danny.cz> 3.3.91-2
+- make wacom support otional
+
 * Mon Mar 05 2012 Bastien Nocera <bnocera@redhat.com> 3.3.91-1
 - Update to 3.3.91
 
