Fixes for packaging (.org source)

Sorry, in #3 I missed that the .el file is generated from the .org, so here are the corresponding changes to the latter file.