[rharwood@redhat.com: Of course the spec file backport isn't clean] [rharwood@redhat.com: Modified patch as well]