diff --git a/globus-gssapi-error.spec b/globus-gssapi-error.spec
index 2ae0205..c81038e 100644
--- a/globus-gssapi-error.spec
+++ b/globus-gssapi-error.spec
@@ -7,7 +7,7 @@
 Name:		globus-gssapi-error
 %global _name %(tr - _ <<< %{name})
 Version:	2.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - GSSAPI Error Library
 
 Group:		System Environment/Libraries
@@ -30,36 +30,35 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-common
 BuildRequires:	grid-packaging-tools
-BuildRequires:	globus-common-devel >= 3
-BuildRequires:	globus-gss-assist-devel >= 3
-BuildRequires:	globus-core >= 4
+BuildRequires:	globus-common-devel%{?_isa} >= 3
+BuildRequires:	globus-gss-assist-devel%{?_isa} >= 3
+BuildRequires:	globus-core%{?_isa} >= 4
 BuildRequires:	doxygen
 BuildRequires:	graphviz
-BuildRequires:	ghostscript
 %if "%{?rhel}" == "5"
 BuildRequires:	graphviz-gd
 %endif
-%if %{?fedora}%{!?fedora:0} >= 9
-BuildRequires:	tex(latex)
-%else
-%if %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:	ghostscript
+%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	tex(latex)
 %else
 BuildRequires:	tetex-latex
 %endif
-%endif
 
 %package devel
 Summary:	Globus Toolkit - GSSAPI Error Library Development Files
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	globus-common-devel >= 3
-Requires:	globus-gss-assist-devel >= 3
-Requires:	globus-core >= 4
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	globus-common-devel%{?_isa} >= 3
+Requires:	globus-gss-assist-devel%{?_isa} >= 3
+Requires:	globus-core%{?_isa} >= 4
 
 %package doc
 Summary:	Globus Toolkit - GSSAPI Error Library Documentation Files
 Group:		Documentation
+%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
+BuildArch:	noarch
+%endif
 Requires:	%{name} = %{version}-%{release}
 
 %description
@@ -193,6 +192,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Jul 23 2009 Mattias Ellert <mattias.ellert@fysast.uu.se> - 2.5-4
+- Add instruction set architecture (isa) tags
+- Make doc subpackage noarch
+
 * Thu Jun 04 2009 Mattias Ellert <mattias.ellert@fysast.uu.se> - 2.5-3
 - Update to official Fedora Globus packaging guidelines