-current. patch-r and patch-s come from the XFRee86-4 port, another patch is required here for scanpci.c (patch-q, submitted by Donald J. Maddox <dmaddox@sc.rr.com>)