diff --git a/configure.in b/configure.in
index 7c9db68ae..86d059275 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.2.4)
+AC_INIT(strongSwan,4.2.5)
 AM_INIT_AUTOMAKE(tar-ustar)
 AC_C_BIGENDIAN
 AC_SUBST(confdir, '${sysconfdir}')
diff --git a/src/pluto/vendor.c b/src/pluto/vendor.c
index 5301c02f3..f509e450b 100644
--- a/src/pluto/vendor.c
+++ b/src/pluto/vendor.c
@@ -206,7 +206,8 @@ static struct vid_struct _vid_tab[] = {
 	/*
 	 * strongSwan
 	 */
-	DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.2.4")
+	DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.2.5")
+	DEC_MD5_VID(STRONGSWAN_4_2_4, "strongSwan 4.2.4")
 	DEC_MD5_VID(STRONGSWAN_4_2_3, "strongSwan 4.2.3")
 	DEC_MD5_VID(STRONGSWAN_4_2_2, "strongSwan 4.2.2")
 	DEC_MD5_VID(STRONGSWAN_4_2_1, "strongSwan 4.2.1")
diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index c139e8cc2..99293e086 100644
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -120,6 +120,7 @@ enum known_vendorid {
   VID_STRONGSWAN_4_2_1		=101,
   VID_STRONGSWAN_4_2_2		=102,
   VID_STRONGSWAN_4_2_3		=103,
+  VID_STRONGSWAN_4_2_4		=104,
 
   /* 101 - 200 : NAT-Traversal */
   VID_NATT_STENBERG_01		=151,
diff --git a/testing/INSTALL b/testing/INSTALL
index 9ca87cca6..3e9d97f15 100644
--- a/testing/INSTALL
+++ b/testing/INSTALL
@@ -71,7 +71,7 @@ are required for the strongSwan testing environment:
 
     * The latest strongSwan distribution
 
-      http://download.strongswan.org/strongswan-4.2.4.tar.bz2
+      http://download.strongswan.org/strongswan-4.2.5.tar.bz2
 
 
 3. Creating the environment
diff --git a/testing/testing.conf b/testing/testing.conf
index 8b4961972..6011deb47 100755
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -21,7 +21,7 @@ UMLTESTDIR=~/strongswan-testing
 
 # Bzipped kernel sources
 # (file extension .tar.bz2 required)
-KERNEL=$UMLTESTDIR/linux-2.6.26-rc3.tar.bz2
+KERNEL=$UMLTESTDIR/linux-2.6.26-rc8.tar.bz2
 
 # Extract kernel version
 KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
@@ -34,7 +34,7 @@ KERNELCONFIG=$UMLTESTDIR/.config-2.6.26
 #UMLPATCH=$UMLTESTDIR/uml_jmpbuf-2.6.18.patch.bz2
 
 # Bzipped source of strongSwan
-STRONGSWAN=$UMLTESTDIR/strongswan-4.2.4.tar.bz2
+STRONGSWAN=$UMLTESTDIR/strongswan-4.2.5.tar.bz2
 
 # strongSwan compile options (use "yes" or "no")
 USE_LIBCURL="yes"