U importunately the 987 spline shaft is about twice the diameter as the 986. There  are some adptorsrs made by VW Mexico that looks anout right but I haven't seen  specs.
Here;  
http://www.thesamba.com/vw/forum/viewtopic.php?t=317217  . At bottom of page...a few link's also
Regards  PK