cd /usr/src
make buildworld
make kernel

reboot in single user mode
mergemaster -p
make installworld
mergemaster
make delete-old
make delete-old-libs
reboot