New upstream. Cleaned up Makefile for consistency between packages. Signed-off-by: Rosen Penev <rosenp@gmail.com>