Gunnar, I had AbstractDelegatingMetadataBuildingOptions implement JpaOrmXmlPersistenceUnitDefaultAware so you should get this support "for free" after you rebuild ORM.