put on separate lines
remove el5-only stuff
move config from here doc to a separate source
upstream 1.5.7