merge crypt back into $top_builddir :)