While here, fix the rc script to start the master instead of the client and vice-versa. ok robert@ (maintainer)