diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn
index f9faeb7..666d8d0 100644
--- a/library/GSUP_Types.ttcn
+++ b/library/GSUP_Types.ttcn
@@ -29,7 +29,7 @@
 	OSMO_GSUP_MSISDN_IE		('08'O),
 	OSMO_GSUP_HLR_NUMBER_IE		('09'O),
 	OSMO_GSUP_PDP_CONTEXT_ID_IE	('10'O),
-	OSMO_GSUP_PDP_TYPE_IE		('11'O),
+	OSMO_GSUP_PDP_ADDRESS_IE	('11'O),
 	OSMO_GSUP_ACCESS_POINT_NAME_IE	('12'O),
 	OSMO_GSUP_PDP_QOS_IE		('13'O),
 	OSMO_GSUP_CHARG_CHAR_IE		('14'O),
@@ -196,6 +196,45 @@
 	octetstring pdu
 };
 
+type union GSUP_PDP_Address {
+	GSUP_PDP_Address_IPv4		ipv4,
+	GSUP_PDP_Address_IPv6		ipv6,
+	GSUP_PDP_Address_IPv4v6	ipv4v6,
+	GSUP_PDP_Address_unknown	other
+} with { variant "TAG(ipv4, pdp_typenum = '21'O;
+		      ipv6, pdp_typenum = '57'O;
+		      ipv4v6, pdp_typenum = '8D'O;
+		      other, OTHERWISE;)" };
+
+type record  GSUP_PDP_Address_IPv4 {
+	BIT4	pdp_typeorg,
+	BIT4	spare,
+	OCT1	pdp_typenum,
+	OCT4	ipv4_address optional
+};
+
+type record GSUP_PDP_Address_IPv6 {
+	BIT4 	pdp_typeorg,
+	BIT4 	spare,
+	OCT1 	pdp_typenum,
+	OCT16	ipv6_address optional
+};
+
+type record GSUP_PDP_Address_IPv4v6 {
+	BIT4 	pdp_typeorg,
+	BIT4 	spare,
+	OCT1 	pdp_typenum,
+	OCT4 	ipv4_address optional,
+	OCT16	ipv6_address optional
+};
+
+type record  GSUP_PDP_Address_unknown {
+	BIT4	pdp_typeorg,
+	BIT4	spare,
+	OCT1	pdp_typenum,
+	octetstring addr optional
+};
+
 type record GSUP_IE {
 	GSUP_IEI	tag,
 	uint8_t		len,
@@ -219,7 +258,7 @@
 				 pdp_info, tag = OSMO_GSUP_PDP_INFO_IE;
 				 apn, tag = OSMO_GSUP_ACCESS_POINT_NAME_IE;
 				 pdp_qos, tag = OSMO_GSUP_PDP_QOS_IE;
-				 pdp_type, tag = OSMO_GSUP_PDP_TYPE_IE;
+				 pdp_address, tag = OSMO_GSUP_PDP_ADDRESS_IE;
 				 charg_char, tag = OSMO_GSUP_CHARG_CHAR_IE;
 				 pdp_ctx_id, tag = OSMO_GSUP_PDP_CONTEXT_ID_IE;
 				 session_state, tag = OSMO_GSUP_SESSION_STATE_IE;
@@ -281,7 +320,7 @@
 	OCT1		pdp_ctx_id,
 	octetstring	apn,
 	octetstring	pdp_qos,
-	OCT2		pdp_type,
+	GSUP_PDP_Address	pdp_address,
 	octetstring	charg_char,
 	/* Session information */
 	GSUP_SessionState	session_state,