diff --git a/anjuta.spec b/anjuta.spec
index 5993a27..129bf43 100644
--- a/anjuta.spec
+++ b/anjuta.spec
@@ -1,6 +1,5 @@
 %if 0%{?fc7}
 %else
-  %define _enable_devhelp --enable-plugin-devhelp
   %define _remove_encoding --remove-key Encoding
 %endif
 
@@ -8,11 +7,11 @@ Summary:	A GNOME development IDE for C/C++
 Name:		anjuta
 Epoch:		1
 Version:	2.2.3
-Release:	2.mc.1%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
-Source0:	http://dl.sf.net/anjuta/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/anjuta/%{name}-%{version}.tar.bz2
 
 Patch0:		%{name}-%{version}-makefile.patch
 Patch1:		%{name}-%{version}-%{name}-tags.patch
@@ -26,13 +25,11 @@ Requires(postun): /sbin/ldconfig
 
 %if 0%{?fc7}
 BuildRequires:	libgnomeui-devel
-%else
-BuildRequires:	devhelp-devel
 %endif
 
 BuildRequires:	autogen
-BuildRequires:	chrpath
 BuildRequires:	desktop-file-utils
+BuildRequires:	devhelp-devel
 BuildRequires:	gettext
 BuildRequires:	glade3-libgladeui-devel
 BuildRequires:	gnome-doc-utils
@@ -63,6 +60,7 @@ The documentation for this package is in %{name}-doc.
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 
+Requires:	gtk-doc
 Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	libgnomeui-devel
 Requires:	libglade2-devel
@@ -97,8 +95,20 @@ chmod 644 `find . -name "*.h" -perm /111 -print`
 iconv --from-code ISO8859-1 --to-code UTF-8 ./THANKS \
   --output THANKS.utf-8 && mv THANKS.utf-8 ./THANKS
 
+# Remove rpaths.
+sed -i.libdir_syssearch --expression \
+  '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \
+  configure
+sed -i.gecko --expression 's|-R\$GECKO_HOME||' configure
+
+# pangox.pc contains rpath linkage on PPC64.
+mkdir -p ./PKGCONFIG
+sed --expression 's|-R/usr/lib64||' %{_libdir}/pkgconfig/pangox.pc > \
+  ./PKGCONFIG/pangox.pc
+
 %build
-%configure --disable-static --enable-gtk-doc %{?_enable_devhelp} \
+export PKG_CONFIG_PATH="./PKGCONFIG"
+%configure --disable-static --enable-gtk-doc --enable-devhelp \
   --enable-plugin-glade --enable-graphviz --enable-plugin-sourceview \
   --disable-plugin-valgrind --enable-plugin-subversion \
   --with-svn-lib=%{_libdir}
@@ -139,13 +149,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/project/terminal/README
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/project/terminal/ChangeLog
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/project/terminal/AUTHORS
 
-# Remove rpaths.
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}-shell
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}-tags
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libanjuta.so.0.0.0
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/libanjuta-*.so
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -186,7 +189,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi
 
 %post doc
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name}-manual || :
 
 %postun doc
 scrollkeeper-update -q || :
@@ -201,7 +204,6 @@ scrollkeeper-update -q || :
 %doc README
 %doc ROADMAP
 %doc THANKS
-%doc doc/ScintillaDoc.html
 %{_bindir}/%{name}
 %{_bindir}/%{name}_import.sh
 %{_bindir}/%{name}_launcher
@@ -230,20 +232,9 @@ scrollkeeper-update -q || :
 %{_libdir}/%{name}/*.plugin
 %{_libdir}/%{name}/libanjuta-*.so
 
-%files doc
-%defattr(-,root, root,-)
-
-%dir %{_datadir}/gnome/help/%{name}-faqs
-%{_datadir}/gnome/help/%{name}-faqs/C
-
-%dir %{_datadir}/gnome/help/%{name}-manual
-%{_datadir}/gnome/help/%{name}-manual/C
-
-%dir %{_datadir}/omf/%{name}-manual
-%{_datadir}/omf/%{name}-manual/%{name}-manual-C.omf
-
 %files devel
 %defattr (-,root,root,-)
+%doc doc/ScintillaDoc.html
 %{_libdir}/libanjuta-ctags.so
 %{_libdir}/libanjuta-egg.so
 %{_libdir}/libanjuta.so
@@ -255,9 +246,33 @@ scrollkeeper-update -q || :
 %dir %{_includedir}/libanjuta-1.0
 %{_includedir}/libanjuta-1.0/libanjuta
 
+%files doc
+%defattr(-,root, root,-)
+
+%dir %{_datadir}/gnome/help/%{name}-faqs
+%{_datadir}/gnome/help/%{name}-faqs/C
+
+%dir %{_datadir}/gnome/help/%{name}-manual
+%{_datadir}/gnome/help/%{name}-manual/C
+
+%dir %{_datadir}/omf/%{name}-manual
+%{_datadir}/omf/%{name}-manual/%{name}-manual-C.omf
+
 %changelog
-* Mon Mar 03 2008 Matej Cepl <mcepl@redhat.com> 2.2.3-2.mc.1.fc9
-- Eliminated ExcludeArch -- should be working now.
+* Thu Mar 27 2008 Debarshi Ray <rishi@fedoraproject.org> - 1:2.2.3-5
+- Fixed Source0 URL according to Fedora packaging guidelines.
+- Removed 'BuildRequires: chrpath' and use better ways of removing rpaths.
+- Added Scintilla documentation to anjuta-devel.
+
+* Fri Feb 29 2008 Debarshi Ray <rishi@fedoraproject.org> - 1:2.2.3-4
+- Restored 'BuildRequires: chrpath' for removing rpaths.
+- Added 'Requires: gtk-doc' for anjuta-devel.
+
+* Fri Feb 29 2008 Debarshi Ray <rishi@fedoraproject.org> - 1:2.2.3-3
+- Enabled Devhelp plugin on Fedora 7.
+- Removed 'BuildRequires: chrpath' and use better ways of removing rpaths.
+- Removed 'ExcludeArch: ppc64'.
+- Fixed post scriplet for the doc subpackage.
 
 * Mon Feb 18 2008 Debarshi Ray <rishi@fedoraproject.org> - 1:2.2.3-2
 - Added 'BuildRequires: libgnomeui-devel' to prevent failure on Fedora 7.