diff --git a/evince.spec b/evince.spec
index 38ef923..f409239 100644
--- a/evince.spec
+++ b/evince.spec
@@ -5,7 +5,7 @@
 
 Name:		evince
 Version:	2.21.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Document viewer
 
 License: 	GPLv2+ and GFDL+
@@ -13,6 +13,7 @@ Group:		Applications/Publishing
 URL:		http://www.gnome.org/projects/evince/
 Source0: 	http://download.gnome.org/sources/%{name}/2.21/%{name}-%{version}.tar.bz2
 Patch0:		evince-0.6.0-print-error.patch
+Patch1:		gio.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel >= %{gtk2_version}
@@ -56,6 +57,7 @@ evince is a GNOME-based document viewer.
 %prep
 %setup -q
 %patch0 -p1 -b .print-error
+%patch1 -p1 -b .gio
 
 %build
 intltoolize --force
@@ -84,7 +86,7 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 # Get rid of static libs and .la files.
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la
 
 # don't ship icon caches
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
@@ -150,7 +152,7 @@ fi
 %defattr(-,root,root,-)
 %doc README COPYING NEWS AUTHORS 
 %{_bindir}/*
-%{_libdir}/nautilus/extensions-1.0/libevince-properties-page.so*
+%{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
@@ -160,6 +162,9 @@ fi
 
 
 %changelog
+* Sun Dec 23 2007 Matthias Clasen <mclasen@redhat.com> - 2.21.1-2
+- Build nautilus extension against nautilus 2.21
+
 * Wed Dec  5 2007 Matthias Clasen <mclasen@redhat.com> - 2.21.1-1
 - Update to 2.21.1
 
diff --git a/gio.patch b/gio.patch
new file mode 100644
index 0000000..137e0cf
--- /dev/null
+++ b/gio.patch
@@ -0,0 +1,12 @@
+diff -up evince-2.21.1/properties/Makefile.am.gio evince-2.21.1/properties/Makefile.am
+--- evince-2.21.1/properties/Makefile.am.gio	2007-12-23 23:58:27.000000000 -0500
++++ evince-2.21.1/properties/Makefile.am	2007-12-23 23:58:34.000000000 -0500
+@@ -21,7 +21,7 @@ endif
+ 
+ nautilus_LTLIBRARIES = $(EVINCE_PROPERTIES_PAGE)
+ 
+-nautilusdir = $(libdir)/nautilus/extensions-1.0/
++nautilusdir = $(libdir)/nautilus/extensions-2.0/
+ libevince_properties_page_la_CFLAGS = -I$(top_srcdir)
+ libevince_properties_page_la_SOURCES = 	\
+ 	ev-properties-main.c