diff --git a/evince.spec b/evince.spec
index eef1361..9bfaf60 100644
--- a/evince.spec
+++ b/evince.spec
@@ -2,10 +2,11 @@
 %global glib2_version 2.25.9
 %global dbus_version 0.70
 %global theme_version 2.17.1
+%global gxps_version 0.2.0
 
 Name:           evince
 Version:        3.3.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Document viewer
 
 License:        GPLv2+ and GFDL
@@ -45,7 +46,7 @@ BuildRequires: kpathsea-devel
 # for the djvu backend
 BuildRequires: djvulibre-devel
 # for the xps backend
-BuildRequires:  libgxps
+BuildRequires:  libgxps-devel >= %{gxps_version}
 
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -115,14 +116,12 @@ automake
 %configure \
         --disable-static \
         --disable-scrollkeeper \
-        --disable-schemas-install \
         --enable-introspection \
         --enable-comics=yes \
         --enable-dvi=yes \
         --enable-djvu=yes \
-        --enable-gxps=yes \
-        --enable-t1lib=yes \
-        --with-gtk=3.0
+        --enable-xps=yes \
+        --enable-t1lib=yes
 make %{?_smp_mflags} V=1 LIBTOOL=/usr/bin/libtool
 
 %install
@@ -197,6 +196,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/evince/3/backends/tiffdocument.evince-backend
 %{_libdir}/evince/3/backends/libcomicsdocument.so
 %{_libdir}/evince/3/backends/comicsdocument.evince-backend
+%{_libdir}/evince/3/backends/libxpsdocument.so
+%{_libdir}/evince/3/backends/xpsdocument.evince-backend
 %{_libdir}/girepository-1.0/EvinceDocument-3.0.typelib
 %{_libdir}/girepository-1.0/EvinceView-3.0.typelib
 
@@ -225,6 +226,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/nautilus/extensions-3.0/libevince-properties-page.so
 
 %changelog
+* Tue Dec 27 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.3.3.1-3
+- Really enable XPS support, drop obsolete build options.
+
 * Fri Dec 23 2011 Matthias Clasen <mclasen@redhat.com> - 3.3.3.1-2
 - Enable xps support
 
@@ -557,7 +561,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 * Sat Oct 25 2008 Matthias Clasen  <mclasen@redhat.com> - 2.24.1-3
 - Require dbus-glib-devel, not just dbus-devel (#465281, Dan Winship)
 
-* Sat Oct 25 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.24.1-2
+* Sat Oct 25 2008 Ville Skyttä <ville.skytta@iki.fi> - 2.24.1-2
 - Drop dependency on desktop-file-utils (#463048).
 
 * Mon Oct 20 2008 Matthias Clasen  <mclasen@redhat.com> - 2.24.1-1