diff --git a/cheese.spec b/cheese.spec
index a858743..1094e7c 100644
--- a/cheese.spec
+++ b/cheese.spec
@@ -8,6 +8,7 @@ License:        GPLv2+
 URL:            http://live.gnome.org/Cheese
 Source0:        http://download.gnome.org/sources/cheese/2.21/%{name}-%{version}.tar.bz2
 Source1:	cheese-bugreport.sh
+Patch0:		libexecdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.10.0
@@ -41,8 +42,11 @@ gstreamer-backend.
 
 %prep
 %setup -q
+%patch0 -p1 -b .libexecdir
 cp %{SOURCE1} data
 
+autoreconf
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -103,6 +107,7 @@ fi
 %{_datadir}/icons/hicolor/*/apps/cheese.png
 %{_datadir}/icons/hicolor/scalable/apps/cheese.svg
 %{_sysconfdir}/gconf/schemas/cheese.schemas
+%{_libexecdir}/cheese-bugreport.sh
 
 %changelog
 * Tue Jan 29 2008  Matthias Clasen  <mclasen@redhat.com> 2.21.91-1
diff --git a/libexecdir.patch b/libexecdir.patch
new file mode 100644
index 0000000..c2e08a9
--- /dev/null
+++ b/libexecdir.patch
@@ -0,0 +1,21 @@
+diff -up cheese-2.21.91/data/cheese.desktop.in.in.libexecdir cheese-2.21.91/data/cheese.desktop.in.in
+--- cheese-2.21.91/data/cheese.desktop.in.in.libexecdir	2008-01-29 10:00:39.000000000 -0500
++++ cheese-2.21.91/data/cheese.desktop.in.in	2008-01-29 10:00:54.000000000 -0500
+@@ -11,4 +11,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=cheese
+ X-GNOME-Bugzilla-Component=general
+ X-GNOME-Bugzilla-Version=@VERSION@
+-X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBDIR@/cheese/cheese-bugreport.sh
++X-GNOME-Bugzilla-ExtraInfoScript=@LIBEXECDIR@/cheese-bugreport.sh
+diff -up cheese-2.21.91/data/Makefile.am.libexecdir cheese-2.21.91/data/Makefile.am
+--- cheese-2.21.91/data/Makefile.am.libexecdir	2008-01-29 10:01:15.000000000 -0500
++++ cheese-2.21.91/data/Makefile.am	2008-01-29 10:01:35.000000000 -0500
+@@ -20,7 +20,7 @@ EXTRA_DIST =						\
+ 	$(schema_in_files)				\
+ 	$(pkgdata_DATA)
+ 
+-bugreportdir      = $(libdir)/cheese
++bugreportdir      = $(libexecdir)
+ bugreport_SCRIPTS = cheese-bugreport.sh
+ 
+ if GCONF_SCHEMAS_INSTALL