Upgrade to 1.9.4, port Makefile adjustments. ok landry@, sebastia@
make it into the package -> no bump.