diff --git a/python26.spec b/python26.spec
index fb717cf..32ee3a7 100644
--- a/python26.spec
+++ b/python26.spec
@@ -99,7 +99,7 @@
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 Version: 2.6.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -422,7 +422,7 @@ provides the libraries needed for this.
 %package devel
 Summary: The libraries and header files needed for Python development
 Group: Development/Libraries
-Requires: %{python}%{?_isa} = %{version}-%{release}
+Requires: %{python} = %{version}-%{release}
 # Needed here because of the migration of Makefile from -devel to the main
 # package
 Conflicts: %{python} < %{version}-%{release}
@@ -786,6 +786,19 @@ find %{buildroot} -name \*.py \
   -perm /u+x,g+x,o+x ! -exec grep -m 1 -q '^#!' {} \; \
   -exec chmod a-x {} \; \) \)
 
+# .xpm and .xbm files should not be executable:
+find %{buildroot} \
+  \( -name \*.xbm -o -name \*.xpm -o -name \*.xpm.1 \) \
+  -exec chmod a-x {} \;
+
+# Remove executable flag from files that shouldn't have it:
+chmod a-x \
+  %{buildroot}%{pylibdir}/Demo/comparisons/patterns \
+  %{buildroot}%{pylibdir}/Demo/rpc/test \
+  %{buildroot}%{pylibdir}/Tools/README \
+  %{buildroot}%{pylibdir}/Demo/scripts/newslist.doc \
+  %{buildroot}%{pylibdir}/Demo/md5test/foo
+
 # Get rid of egg-info files (core python modules are installed through rpms)
 rm %{buildroot}%{pylibdir}/*.egg-info
 
@@ -845,6 +858,10 @@ sed \
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 install -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/rpm/macros.python26
 
+# Fixup permissions for shared libraries from non-standard 555 to standard 755:
+find %{buildroot} \
+    -perm 555 -exec chmod 755 {} \;
+
 %check
 # Run the upstream test suite
 LD_LIBRARY_PATH=$(pwd) ./runtests.sh
@@ -962,7 +979,7 @@ rm -fr %{buildroot}
 %endif
 %{_bindir}/python%{pybasever}
 %{_mandir}/*/*
-%{_sysconfdir}/rpm/macros.python26
+%config(noreplace) %{_sysconfdir}/rpm/macros.python26
 
 %dir %{pylibdir}
 %dir %{dynload_dir}
@@ -1160,6 +1177,11 @@ rm -fr %{buildroot}
 # payload file would be unpackaged)
 
 %changelog
+* Tue Apr  6 2010 David Malcolm <dmalcolm@redhat.com> - 2.6.5-3
+- drop the use of _isa as RHEL5's rpmbuild doesn't support it
+- fix permissions on various data files and scripts
+- mark /etc/macros.python26 as a config file
+
 * Mon Mar 29 2010 David Malcolm <dmalcolm@redhat.com> - 2.6.5-2
 - add a %%check section, running the regression test suite and failing the
 build if an unexpected error occurs
