diff --git a/at-spi-unneeded-deps.patch b/at-spi-unneeded-deps.patch
new file mode 100644
index 0000000..af05e55
--- /dev/null
+++ b/at-spi-unneeded-deps.patch
@@ -0,0 +1,35 @@
+diff -up at-spi-1.25.2/configure.in.xtst at-spi-1.25.2/configure.in
+--- at-spi-1.25.2/configure.in.xtst	2008-12-01 01:52:24.000000000 -0500
++++ at-spi-1.25.2/configure.in	2008-12-08 23:38:31.000000000 -0500
+@@ -144,7 +144,6 @@ LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variab
+ AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
+ AC_SUBST(LIBBONOBO_IDL_DIR)
+ 
+-LIBS="$LIBS $X_LIBS"
+ dnl path to Xtst
+ AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[
+ 	AC_MSG_ERROR([Couldn't find the Xtst library. Check config.log])],
+diff -up at-spi-1.25.2/cspi/Makefile.am.xtst at-spi-1.25.2/cspi/Makefile.am
+--- at-spi-1.25.2/cspi/Makefile.am.xtst	2008-12-08 23:44:31.000000000 -0500
++++ at-spi-1.25.2/cspi/Makefile.am	2008-12-08 23:44:43.000000000 -0500
+@@ -14,7 +14,7 @@ libcspi_la_LDFLAGS = @LDFLAGS@ @LT_VERSI
+ 
+ LDADD =				\
+ 	$(top_builddir)/libspi/libspi.la	\
+-	$(LIBCSPI_LIBS) $(X_LIBS)
++	$(LIBCSPI_LIBS) 
+ 
+ libcspidir = $(includedir)/at-spi-1.0/cspi
+ libcspi_HEADERS =		\
+diff -up at-spi-1.25.2/libspi/Makefile.am.xtst at-spi-1.25.2/libspi/Makefile.am
+--- at-spi-1.25.2/libspi/Makefile.am.xtst	2007-11-28 01:43:23.000000000 -0500
++++ at-spi-1.25.2/libspi/Makefile.am	2008-12-08 23:38:31.000000000 -0500
+@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)	\
+            $(X_CFLAGS)
+ 
+ libspi_la_LDFLAGS = @LT_VERSION_INFO@ -no-undefined
+-libspi_la_LIBADD = $(LIBSPI_LIBS) $(XTST_LIBS)
++libspi_la_LIBADD = $(LIBSPI_LIBS)
+ 
+ libspiincludedir = $(includedir)/at-spi-1.0/libspi
+ 
diff --git a/at-spi.spec b/at-spi.spec
index 5027fb7..9a07e4f 100644
--- a/at-spi.spec
+++ b/at-spi.spec
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.25.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.25/%{name}-%{version}.tar.bz2
 
@@ -43,10 +43,13 @@ BuildRequires: libXtst-devel
 BuildRequires: libXi-devel
 BuildRequires: libXevie-devel 
 BuildRequires: libXt-devel 
+BuildRequires: gnome-common
 BuildRequires: automake, autoconf, libtool, intltool
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=548782
 Patch4: evo-crash.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=563806
+Patch5: at-spi-unneeded-deps.patch
 
 %description
 at-spi allows assistive technologies to access GTK-based
@@ -84,8 +87,9 @@ This package contains Python bindings allowing to use at-spi in Python programs.
 %prep
 %setup -q
 %patch4 -p1 -b .evo-crash
+%patch5 -p1 -b .unneeded-deps
 
-autoconf
+autoreconf -i -f
 
 %build
 %configure --disable-gtk-doc --disable-static
@@ -101,6 +105,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/*.la
 
+mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} \
+   $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version} 
+
 %pre
 if [ "$1" -gt 1 -a -f %{_sysconfdir}/gconf/schemas/at-spi.schemas ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -136,6 +143,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
+%doc %{_datadir}/doc/%{name}-devel-%{version}
 %{_datadir}/gtk-doc/html/*
 %{_datadir}/idl/*
 %{_libdir}/lib*.so
@@ -148,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  8 2008 Matthias Clasen <mclasen@redhat.com> - 1.25.2-4
+- Reduce unused direct deps 
+
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 1.25.2-3
 - Rebuild for Python 2.6