Update the GENERIC* to have the new file system options and the new kernel name. Fix the clean target in Makefile.i386 to rm kernel instead of 386bsd.