diff --git a/shutter.spec b/shutter.spec
index ce892dc..6e08638 100644
--- a/shutter.spec
+++ b/shutter.spec
@@ -1,6 +1,6 @@
 Name:		shutter
 Version:	0.89.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GTK+ 2.0 screenshot application written in perl
 Group:		Applications/Multimedia
 License:	GPLv3+
@@ -20,7 +20,7 @@ Requires:   perl(Goo::Canvas)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %{?filter_setup:
-%filter_provides_in %{_datadir}/shutter/resources/system/upload_plugins
+%filter_provides_in %{_datadir}/%{name}/resources/system/upload_plugins
 %filter_setup
 }
 
@@ -33,7 +33,8 @@ with a comfortable GUI using the GTK+ 2.0 framework
 
 %prep
 %setup -q -n %{name}-%{version}
-rm -fr share/shutter/resources/po/
+rm -r share/%{name}/resources/modules/X11
+rm -fr share/%{name}/resources/po/
 rm -fr share/doc
 
 %build
@@ -45,9 +46,9 @@ install -d -m 0755 -p $RPM_BUILD_ROOT%{_datadir}
 install -d -m 0755 -p $RPM_BUILD_ROOT%{perl_vendorlib}
 cp -pfr bin/* $RPM_BUILD_ROOT%{_bindir}/
 cp -pfr share/* $RPM_BUILD_ROOT%{_datadir}/
-mv $RPM_BUILD_ROOT%{_datadir}/shutter/resources/modules/* \
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/resources/modules/* \
    $RPM_BUILD_ROOT%{perl_vendorlib}
-rmdir $RPM_BUILD_ROOT%{_datadir}/shutter/resources/modules/
+rmdir $RPM_BUILD_ROOT%{_datadir}/%{name}/resources/modules/
 
 desktop-file-install --delete-original \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -76,7 +77,7 @@ fi
 %files -f %{name}.lang
 %doc CHANGES README COPYING
 %{_bindir}/%{name}
-%{perl_vendorlib}/*
+%{perl_vendorlib}/Shutter/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}
 %{_mandir}/man1/%{name}*
@@ -85,6 +86,9 @@ fi
 %{_datadir}/icons/ubuntu-mono-*/*/apps/%{name}-panel.*
 
 %changelog
+* Mon Aug 20 2012 Robin Lee <cheeselee@fedoraproject.org> - 0.89.1-2
+- Remove the bundled perl(X11::Protocol::Ext::XFIXES)
+
 * Thu Aug 16 2012 Robin Lee <cheeselee@fedoraproject.org> - 0.89.1-1
 - Update to 0.89.1
 - Remove the patch for desktop entry file