Rebuilding Kernel

[beno]

Hi;
I just barely finished upgrading from 5.3 to 6.1 and all is well, 
however, now I realize I have to rebuild my kernel again to accommodate 
PF. I've edited the correct GENERIC file (I'm on an i386 box). Are these 
commands sufficient?

make buildkernel
make installkernel

or do I need to redo all this?

make buildkernel
make installkernel
sh /etc/rc.shutdown 
pkill sendmail
pkill syslogd
mergemaster -p
make installworld
mergemaster
reboot
/usr/local/bin/portmanager -u -f -l -y
make delete-old-libs

TIA,
beno