diff --git a/anjuta.changes b/anjuta.changes
index 5b0ed36..e60e93b 100644
--- a/anjuta.changes
+++ b/anjuta.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct 26 12:50:00 CEST 2007 - sbrabec@suse.cz
+
+- Require autogen (#336176).
+- Fixed shared libbfd detection.
+
 -------------------------------------------------------------------
 Wed Oct 24 15:25:00 CEST 2007 - sbrabec@suse.cz
 
diff --git a/anjuta.spec b/anjuta.spec
index 36cfb6a..e3c4e1a 100644
--- a/anjuta.spec
+++ b/anjuta.spec
@@ -17,9 +17,11 @@ BuildRequires:  autogen binutils-devel devhelp-devel fdupes gcc-c++ gdl-devel gn
 BuildRequires:  sqlite-devel
 License:        GPL v2 or later
 Group:          Development/Tools/IDE
+# Directly required by anjuta:
+Requires:       autogen
 Requires:       automake autoconf libtool gettext alsa alsa-devel audiofile devhelp esound esound-devel gconf2 gconf2-devel gconf2-doc gnome-terminal gnome-vfs2 gnome-vfs2-devel gnome-vfs2-doc libart_lgpl libart_lgpl-devel libbonobo libbonobo-devel libbonobo-doc libbonoboui libbonoboui-devel libbonoboui-doc libglade2 libglade2-devel libglade2-doc libgnome libgnome-devel libgnome-doc libgnomecanvas libgnomecanvas-devel libgnomecanvas-doc libgnomeui libgnomeui-devel libgnomeui-doc libwnck libwnck-devel libxml2 libxml2-devel openssl openssl-devel orbit2 orbit2-devel popt popt-devel libgnomeprint libgnomeprint-devel libgnomeprint-doc libgnomeprintui libgnomeprintui-devel libgnomeprintui-doc yelp gnome-doc-utils
 Version:        2.2.2
-Release:        5
+Release:        9
 Requires:       %{name}-lang = %{version}
 Summary:        GNOME IDE for C and C++
 Source:         anjuta-%{version}.tar.bz2
@@ -94,7 +96,7 @@ cp -a %{S:1} .
 # - dynamic library, which is binutils version specific.
 # We have to use dynamic library and make libanjuta dependent on
 # specific version of binutils.
-sed -i "s/-Wl,-Bstatic -lbfd -liberty -Wl,-Bdynamic/-l$(echo /usr/lib64/libbfd*.so | sed 's:.*/lib::;s/\.so//') -Wl,-Bstatic -liberty -Wl,-Bdynamic/" configure.in
+sed -i "s/-Wl,-Bstatic -lbfd -liberty -Wl,-Bdynamic/-l$(echo /usr/%{_lib}/libbfd*.so | sed 's:.*/lib::;s/\.so//') -Wl,-Bstatic -liberty -Wl,-Bdynamic/" configure.in
 
 %build
 autoreconf -f -i
@@ -189,6 +191,9 @@ fi
 
 %files lang -f %name.lang
 %changelog
+* Fri Oct 26 2007 - sbrabec@suse.cz
+- Require autogen (#336176).
+- Fixed shared libbfd detection.
 * Wed Oct 24 2007 - sbrabec@suse.cz
 - Build all optional plugins except GtkSourceView: subversion,
   glade, class inheritance, performance profiler, Valgrind.