Merging hibernate-envers into hibernate-core would also solve the problem. What do y'all think of that? Chris Cranford?