diff --git a/NEWS b/NEWS
index 41253210a..bead39a7a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+strongswan-4.2.11
+-----------------
+
+-
+
+
 strongswan-4.2.10
 -----------------
 
diff --git a/configure.in b/configure.in
index ea9b6dd20..ff1c25ee8 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.2.10)
+AC_INIT(strongSwan,4.2.11)
 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 a490b7079..90c239e85 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.10")
+	DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.2.11")
+	DEC_MD5_VID(STRONGSWAN_4_2_10,"strongSwan 4.2.10")
 	DEC_MD5_VID(STRONGSWAN_4_2_9, "strongSwan 4.2.9")
 	DEC_MD5_VID(STRONGSWAN_4_2_8, "strongSwan 4.2.8")
 	DEC_MD5_VID(STRONGSWAN_4_2_7, "strongSwan 4.2.7")
diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index fa1c44faa..21b724d98 100644
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -126,6 +126,7 @@ enum known_vendorid {
   VID_STRONGSWAN_4_2_7		=107,
   VID_STRONGSWAN_4_2_8		=108,
   VID_STRONGSWAN_4_2_9		=109,
+  VID_STRONGSWAN_4_2_10		=110,
 
   /* 101 - 200 : NAT-Traversal */
   VID_NATT_STENBERG_01		=151,
diff --git a/testing/INSTALL b/testing/INSTALL
index 9ac654b54..e2722c373 100644
--- a/testing/INSTALL
+++ b/testing/INSTALL
@@ -53,16 +53,16 @@ are required for the strongSwan testing environment:
     * A vanilla Linux kernel on which the UML kernel will be based on.
       We recommend the use of
 
-      http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.6.tar.bz2
+      http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2
 
     * The Linux kernel 2.6.26 requires the following patch for the uml guest kernel
       to successfully start up:
 
-      http://download.strongswan.org/uml/uml-2.6.26.patch.bz2
+      http://download.strongswan.org/uml/uml-2.6.28.patch.bz2
 
     * The matching .config file required to compile the UML kernel:
 
-      http://download.strongswan.org/uml/.config-2.6.27
+      http://download.strongswan.org/uml/.config-2.6.28
 
     * A gentoo-based UML file system (compressed size 130 MBytes) found at
 
@@ -70,7 +70,7 @@ are required for the strongSwan testing environment:
 
     * The latest strongSwan distribution
 
-      http://download.strongswan.org/strongswan-4.2.10.tar.bz2
+      http://download.strongswan.org/strongswan-4.2.11.tar.bz2
 
 
 3. Creating the environment
diff --git a/testing/testing.conf b/testing/testing.conf
index 1db1c928f..cce264d00 100755
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -21,19 +21,19 @@ UMLTESTDIR=~/strongswan-testing
 
 # Bzipped kernel sources
 # (file extension .tar.bz2 required)
-KERNEL=$UMLTESTDIR/linux-2.6.27.7.tar.bz2
+KERNEL=$UMLTESTDIR/linux-2.6.28.tar.bz2
 
 # Extract kernel version
 KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
 
 # Kernel configuration file
-KERNELCONFIG=$UMLTESTDIR/.config-2.6.27
+KERNELCONFIG=$UMLTESTDIR/.config-2.6.28
 
 # Bzipped uml patch for kernel
-UMLPATCH=$UMLTESTDIR/uml-2.6.26.patch.bz2
+UMLPATCH=$UMLTESTDIR/uml-2.6.28.patch.bz2
 
 # Bzipped source of strongSwan
-STRONGSWAN=$UMLTESTDIR/strongswan-4.2.10.tar.bz2
+STRONGSWAN=$UMLTESTDIR/strongswan-4.2.11.tar.bz2
 
 # strongSwan compile options (use "yes" or "no")
 USE_LIBCURL="yes"