emacs: ELPA compatibility
Merge pull request #705 from yasuyk/elpa

emacs: ELPA compatibility