Changed options to (I think) work with the makefile unchanged (at least on Debian wheezy)