diff --git a/grace.spec b/grace.spec
index 52a1e64..d67900d 100644
--- a/grace.spec
+++ b/grace.spec
@@ -1,10 +1,10 @@
 Name:           grace
 Version:        5.1.20
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
-# Xbae is BSD and cephes is LGPL, see also Source3 and Source4 
+# cephes is LGPL, see also Source3 and Source4 
 URL:            http://plasma-gate.weizmann.ac.il/Grace/
 Source0:        ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
@@ -17,13 +17,13 @@ Group:          Applications/Engineering
 
 BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
 BuildRequires:  zlib-devel, fftw2-devel, t1lib-devel
-BuildRequires:  openmotif-devel, gcc-gfortran
+BuildRequires:  xbae-devel, gcc-gfortran
 BuildRequires:  desktop-file-utils, font-utils
 
-%if "%{fedora}" >= "5"
-BuildRequires: libXpm-devel
-%else
+%if "%{fedora}" < "5"
 BuildRequires: xorg-x11-devel
+%else
+BuildRequires: libXpm-devel
 %endif
 
 Requires:	nedit
@@ -55,6 +55,7 @@ Install these files if you need to compile software that requires grace.
 %patch
 # remove stripping option to have meaningfull debuginfo packages
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' */Makefile
+rm -rf Xbae
 
 %build
 cp %{SOURCE3} %{SOURCE4} .
@@ -68,7 +69,8 @@ cp %{SOURCE3} %{SOURCE4} .
     --with-x \
     --with-f77=gfortran \
     --with-extra-incpath=%{_includedir}/netcdf-3 \
-    --with-extra-ldpath=%{_libdir}/netcdf-3
+    --with-extra-ldpath=%{_libdir}/netcdf-3 \
+    --with-bundled-xbae=no
     
 make %{?_smp_mflags}
 
@@ -77,7 +79,6 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-cp Xbae/LICENSE LICENSE.Xbae
 rm -f doc/*.1
 
 mkdir -pm 755                               \
@@ -143,7 +144,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae
+%doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README 
 %doc cephes-license.email LICENSE.cephes
 %doc examples/ doc/ 
 %config(noreplace) %{_sysconfdir}/%{name}/
@@ -166,6 +167,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 24 2006 José Matos <jamatos[AT]fc.up.pt> - 5.1.20-3
+- Use external xbae.
+- Revert test for fedora macro so that it works by default for latest
+  versions if the macro is not defined.
+
 * Mon Sep 11 2006 José Matos <jamatos[AT]fc.up.pt> - 5.1.20-2
 - Fix html documentation viewer. (#188696)