[Qmulus]

I think one key here is that the '05 and '06 987s use the M96.25 (2.7L) and M96.26 (3.2L) engines. While these are very slightly different than the earlier M96s (specifically the '03 and '04 M96.23 and M96.24 "three chain" engines), swapping them in is not a big deal. I had misidentified the '05 and '06 engines as M97 in a previous post, which may have caused some confusion, so I have now fixed that post. I hate posting incorrect information of any type. That said, the later M97s ('07> 2.9L and 3.4L) had more issues to deal with, but some people have already made them work.