diff --git a/translate-toolkit.spec b/translate-toolkit.spec
index 8f81f1c..679e4b8 100644
--- a/translate-toolkit.spec
+++ b/translate-toolkit.spec
@@ -11,8 +11,12 @@ URL:            http://translate.sourceforge.net/wiki/toolkit/index
 Source0:        http://downloads.sourceforge.net/project/translate/Translate%20Toolkit/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Common patches
 Patch0:         translate-toolkit-1.5.3-stoplist.patch
 Patch1:         translate-toolkit-1.5.0-langmodel_dir.patch
+# Fedora patches
+
+# EL patches
 
 BuildArch:      noarch
 %if 0%{?fedora} >= 14
@@ -23,17 +27,20 @@ BuildRequires:  python-devel
 # The following are needed for man page generation
 BuildRequires:  python-lxml
 BuildRequires:  python-simplejson
-BuildRequires:  python-vobject
-Requires:       gettext-libs
-Requires:       python-enchant
+%{?fedora:BuildRequires:  python-vobject}
+%{?fedora:Requires:       gettext-libs}
+# EL-5 has gettext = 0.14.6.  cPO and new fPO need libgettextpo which was introduced in
+# 0.14.2.  Some of the improvements since then won't work
+%{?rhel:Requires:       gettext}
+%{?fedora:Requires:       python-enchant}
 Requires:       python-iniparse
 Requires:       python-Levenshtein
 Requires:       python-lxml
 %ifarch %{ix86}
-Requires:       python-psyco
+%{?fedora:Requires:       python-psyco}
 %endif
 Requires:       python-simplejson
-Requires:       python-vobject
+%{?fedora:Requires:       python-vobject}
 %if 0%{?fedora} >= 14
 Requires:       aeidon
 %endif
@@ -73,8 +80,8 @@ toolkit or to use the libraries in other localization tools.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .stoplist
+%patch1 -p1 -b .langmodel_dir
 
 
 %build
@@ -85,6 +92,11 @@ toolkit or to use the libraries in other localization tools.
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+%if 0%{?rhel}
+# Cleanup some applications that won't work because of missing dependencies
+rm $RPM_BUILD_ROOT/%{_bindir}/{ical2po,po2ical,sub2po,po2sub}
+%endif
+
 # create manpages
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 for program in $RPM_BUILD_ROOT/%{_bindir}/*; do
@@ -152,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Jun 7 2010 Dwayne Bailey <dwayne@translate.org.za> - 1.7.0-2
 - Backport upstream r14600 to fix rhbz#600561
 
+* Thu May 13 2010 Dwayne Bailey <dwayne@translate.org.za> - 1.7.0-2
+- Align spec with EL-5, fixing missing dependencies
+
 * Thu May 13 2010 Dwayne Bailey <dwayne@translate.org.za> - 1.7.0-1
 - Update to 1.7.0
    - Support for Array constructs in the PHP converter
@@ -240,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT
    - r12724 hassuggestion speedup
    - r12727 msgidcomment
 
+* Thu Oct 15 2009 Dwayne Bailey <dwayne@translate.org.za> - 1.4.1-2
+- Retag
+
 * Thu Oct 15 2009 Dwayne Bailey <dwayne@translate.org.za> - 1.4.1-1
 - Update to 1.4.1
    - Better support for printf (including numbered) variables (bug 1118)