diff --git a/configure.in b/configure.in
index abb656344..8dbc2d289 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ dnl ===========================
 dnl  initialize & set some vars
 dnl ===========================
 
-AC_INIT(strongSwan,4.0.4)
+AC_INIT(strongSwan,4.0.5)
 AM_INIT_AUTOMAKE(tar-ustar)
 AC_C_BIGENDIAN
 AC_SUBST(ipsecdir, '${libexecdir}/ipsec')
diff --git a/src/pluto/vendor.c b/src/pluto/vendor.c
index 57e71c8f8..7fd24a073 100644
--- a/src/pluto/vendor.c
+++ b/src/pluto/vendor.c
@@ -195,13 +195,14 @@ static struct vid_struct _vid_tab[] = {
 	/*
 	 * strongSwan
 	 */
-	DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.0.4")
+	DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.0.5")
+	DEC_MD5_VID(STRONGSWAN_4_0_4, "strongSwan 4.0.4")
 	DEC_MD5_VID(STRONGSWAN_4_0_3, "strongSwan 4.0.3")
 	DEC_MD5_VID(STRONGSWAN_4_0_2, "strongSwan 4.0.2")
 	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_7_4, "strongSwan 2.7.4")
+	DEC_MD5_VID(STRONGSWAN_2_8_0, "strongSwan 2.8.0")
 	DEC_MD5_VID(STRONGSWAN_2_7_3, "strongSwan 2.7.3")
 	DEC_MD5_VID(STRONGSWAN_2_7_2, "strongSwan 2.7.2")
 	DEC_MD5_VID(STRONGSWAN_2_7_1, "strongSwan 2.7.1")
diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index f08ff4400..1161b8673 100644
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -80,12 +80,13 @@ enum known_vendorid {
   VID_STRONGSWAN_2_7_1		= 59,
   VID_STRONGSWAN_2_7_2		= 60,
   VID_STRONGSWAN_2_7_3		= 61,
-  VID_STRONGSWAN_2_7_4		= 62,
+  VID_STRONGSWAN_2_8_0		= 62,
 
   VID_STRONGSWAN_4_0_0		= 70,
   VID_STRONGSWAN_4_0_1		= 71,
   VID_STRONGSWAN_4_0_2		= 72,
   VID_STRONGSWAN_4_0_3		= 73,
+  VID_STRONGSWAN_4_0_4		= 74,
 
   /* 101 - 200 : NAT-Traversal */
   VID_NATT_STENBERG_01		=101,