Have you tried the 1008 patch? It does what you are asking for:
Maybe these templates will help with Orac?