Changes to implement redhat-dok (Hal Burgiss)