I have sucessfully merged those two patches to work with openbsd 5.5 current. Thanks to jcs who made the original patch for the x201 laptop. and thanks for the patch from jjjesss who made that apmd patch.
Original links is here:
My customized patches can be found here: