Ported new stuff to RHEL4 spec