merged in changes with packge information

Benjamin Mako Hill || Want to submit a patch?