diff --git a/fish.spec b/fish.spec
index 8eadba7..c5808a3 100644
--- a/fish.spec
+++ b/fish.spec
@@ -2,7 +2,7 @@ Summary:                A friendly interactive shell
 Name:                   fish
 
 Version:                1.21.10
-Release:                1%{?dist}
+Release:                2%{?dist}
 
 License:                GPL
 Group:                  System Environment/Shells
@@ -15,12 +15,10 @@ BuildRequires:          ncurses-devel gettext groff
 
 
 # Locate correct build time-dependencies for providing X headers
-%if 0%{?fedora}
-
 %if "%fedora" >= "5"
 
 # Modern Fedora version, has modular X.org
-BuildRequires:          xorg-x11-proto-devel libX11-devel libXt-devel
+BuildRequires:          xorg-x11-proto-devel libX11-devel libXt-devel libXext-devel
 
 %endif
 
@@ -33,17 +31,18 @@ BuildRequires:          xorg-x11-devel
 %endif
 %endif
 
+%if 0%{?fedora}
 %if "%fedora" < "3"
 
 # Ancient Fedora version, has XFree86
 BuildRequires:          XFree86-devel
 
 %endif
-
 %else
 
-# This is not a Fedora system, try guessing BuildRequires by 
-# looking at the directory structure
+# The %fedora variable has not been correctly defined, or this is is
+# not a Fedora system, try guessing BuildRequires by looking at the
+# directory structure
 %define xinclude /usr%(if [ -d /usr/X11R6/include ]; then echo /X11R6; fi)/include
 BuildRequires:          %{xinclude}/X11/StringDefs.h, %{xinclude}/X11/Xlib.h
 BuildRequires:          %{xinclude}/X11/Intrinsic.h,  %{xinclude}/X11/Xatom.h
@@ -78,6 +77,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" 
 
+# Find translation files
+%find_lang %{name}.\*
 
 
 
@@ -106,7 +107,8 @@ fi
 
 
 
-%files
+%files -f %{name}.\*.lang
+
 %defattr(-,root,root,-)
 
 # The documentation directory
@@ -148,8 +150,6 @@ fi
 %dir %_datadir/fish/functions
 %_datadir/fish/functions/*.fish
 
-# Translations
-%_datadir/locale/*/LC_MESSAGES/fish.mo