You could always backport the useful patches against mainline to the version running on the N900. Would probably be a lot easier than dealing with broken firmware,etc that is out of our hands