diff --git a/configure.in b/configure.in
index e97e69139..3ecc0b88f 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.3.2)
+AC_INIT(strongSwan,4.3.3)
 AM_INIT_AUTOMAKE(tar-ustar)
 AC_SUBST(confdir, '${sysconfdir}')
 PKG_PROG_PKG_CONFIG
diff --git a/src/pluto/vendor.c b/src/pluto/vendor.c
index ff145eb38..dfa8667b1 100644
--- a/src/pluto/vendor.c
+++ b/src/pluto/vendor.c
@@ -197,9 +197,11 @@ static struct vid_struct _vid_tab[] = {
 		/*
 		 * strongSwan
 		 */
-		DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.3.2")
+		DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.3.3")
+		DEC_MD5_VID(STRONGSWAN_4_3_2, "strongSwan 4.3.2")
 		DEC_MD5_VID(STRONGSWAN_4_3_1, "strongSwan 4.3.1")
 		DEC_MD5_VID(STRONGSWAN_4_3_0, "strongSwan 4.3.0")
+		DEC_MD5_VID(STRONGSWAN_4_2_16,"strongSwan 4.2.16")
 		DEC_MD5_VID(STRONGSWAN_4_2_15,"strongSwan 4.2.15")
 		DEC_MD5_VID(STRONGSWAN_4_2_14,"strongSwan 4.2.14")
 		DEC_MD5_VID(STRONGSWAN_4_2_13,"strongSwan 4.2.13")
@@ -237,6 +239,7 @@ static struct vid_struct _vid_tab[] = {
 		DEC_MD5_VID(STRONGSWAN_4_0_1, "strongSwan 4.0.1")
 		DEC_MD5_VID(STRONGSWAN_4_0_0, "strongSwan 4.0.0")
 
+		DEC_MD5_VID(STRONGSWAN_2_8_10,"strongSwan 2.8.10")
 		DEC_MD5_VID(STRONGSWAN_2_8_9, "strongSwan 2.8.9")
 		DEC_MD5_VID(STRONGSWAN_2_8_8, "strongSwan 2.8.8")
 		DEC_MD5_VID(STRONGSWAN_2_8_7, "strongSwan 2.8.7")
diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index 164c1aa6d..2bf84728f 100644
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -92,6 +92,7 @@ enum known_vendorid {
   VID_STRONGSWAN_2_8_7          = 73,
   VID_STRONGSWAN_2_8_8          = 74,
   VID_STRONGSWAN_2_8_9          = 75,
+  VID_STRONGSWAN_2_8_10         = 76,
 
   VID_STRONGSWAN_4_0_0          = 80,
   VID_STRONGSWAN_4_0_1          = 81,
@@ -130,8 +131,10 @@ enum known_vendorid {
   VID_STRONGSWAN_4_2_13         =113,
   VID_STRONGSWAN_4_2_14         =114,
   VID_STRONGSWAN_4_2_15         =115,
-  VID_STRONGSWAN_4_3_0          =116,
-  VID_STRONGSWAN_4_3_1          =117,
+  VID_STRONGSWAN_4_2_16         =116,
+  VID_STRONGSWAN_4_3_0          =117,
+  VID_STRONGSWAN_4_3_1          =118,
+  VID_STRONGSWAN_4_3_2          =119,
 
   /* 101 - 200 : NAT-Traversal */
   VID_NATT_STENBERG_01          =151,
diff --git a/testing/INSTALL b/testing/INSTALL
index 87bb787c8..681376ffc 100644
--- a/testing/INSTALL
+++ b/testing/INSTALL
@@ -53,22 +53,22 @@ 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.29.4.tar.bz2
+      http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.30.tar.bz2
 
     * The Linux kernel 2.6.29 does not require any patches for the uml guest kernel
       to successfully start up.
 
     * The matching .config file required to compile the UML kernel:
 
-      http://download.strongswan.org/uml/.config-2.6.29
+      http://download.strongswan.org/uml/.config-2.6.30
 
     * A gentoo-based UML file system (compressed size 130 MBytes) found at
 
-      http://download.strongswan.org/uml/gentoo-fs-20090325.tar.bz2
+      http://download.strongswan.org/uml/gentoo-fs-20090615.tar.bz2
 
     * The latest strongSwan distribution
 
-      http://download.strongswan.org/strongswan-4.3.2.tar.bz2
+      http://download.strongswan.org/strongswan-4.3.3.tar.bz2
 
 
 3. Creating the environment
diff --git a/testing/testing.conf b/testing/testing.conf
index 39bff6805..881c66bbe 100755
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -31,7 +31,7 @@ KERNELCONFIG=$UMLTESTDIR/.config-2.6.30
 #UMLPATCH=$UMLTESTDIR/aead_init.patch.bz2
 
 # Bzipped source of strongSwan
-STRONGSWAN=$UMLTESTDIR/strongswan-4.3.2.tar.bz2
+STRONGSWAN=$UMLTESTDIR/strongswan-4.3.3.tar.bz2
 
 # strongSwan compile options (use "yes" or "no")
 USE_LIBCURL="yes"
@@ -54,7 +54,7 @@ USE_TEST_VECTORS="yes"
 USE_GCRYPT="yes"
 
 # Gentoo linux root filesystem
-ROOTFS=$UMLTESTDIR/gentoo-fs-20090325.tar.bz2
+ROOTFS=$UMLTESTDIR/gentoo-fs-20090615.tar.bz2
 
 # Size of the finished root filesystem in MB
 ROOTFSSIZE=600