Upgrading from FreeBSD 6.2 to FreeBSD 7.0

Hi,

On a test system, I'm trying to upgrade FreeBSD 6.2 to 7.0 using the
instructions from Ralf Engelschall.
http://people.freebsd.org/~rse/upgrade/freebsd-upgrade-6x-7x.txt
I'm stuck at compiling the new kernel.

Here are the steps I took:

 - install backward compatibility files localedata-5.4.tbz
compat6x-i386-6.x.xxxxxx.yyyymm.tbz
	from: ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-7-current/All
	also tried upgrading with the files
	from: ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-7.0-release/All
	Same result however
 - install latest FreeBSD Upgrade Toolkit
	http://people.freebsd.org/~rse/dist/freebsd-adm-1.2.2.tar.gz
 - upgrade /usr/src
	$ cd /usr/src && make cleandir
	reports an error if there is nothing to clean
	$ cd /usr/adm && make update
	runs just fine.
 - upgrade kernel configuration
	I've added/checked if the options with ">>" in rse's howto are in
	/sys/i386/conf/GENERIC (or in my case 'hostname -s'
/sys/i386/conf/TESTRABIT)
	I've removed/checked that the options with "<<" are not in TESTRABIT
 - prepare the upgrade
	$  mergemaster -p
 - build new system
	$ cd /usr/adm && make world-build
	runs without problems
	$ make kernel-build
==== PROBS ====
Building kernel+modules (TESTRABIT)

--------------------------------------------------------------
>>> Kernel build for TESTRABIT started on Wed Feb 20 16:03:46 CET 2008
--------------------------------------------------------------
===> TESTRABIT
mkdir -p /usr/obj/usr/src/sys

--------------------------------------------------------------
>>> stage 1: configuring the kernel
--------------------------------------------------------------
cd /usr/src/sys/i386/conf;
PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bi
n:/usr/obj/usr/src/tmp/legacy/usr/games:/usr/obj/usr/src/tmp/usr/sbin:/usr/o
bj/usr/src/tmp/usr/bin:/usr/obj/usr/src/tmp/usr/games:/sbin:/bin:/usr/sbin:/
usr/bin  config  -d /usr/obj/usr/src/sys/TESTRABIT
/usr/src/sys/i386/conf/TESTRABIT
/usr/src/sys/i386/conf/TESTRABIT: unknown option "IPSEC_ESP"
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
kernel build duration: 00:00:00
==== STUCK ====

My guess is that the ipsec (crypto?) source code is missing? Is this
correct? If so, where can I find it and where should I put it?

Best regards,

Hansa