diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c
index b6ac56d..8663f44 100644
--- a/src/gsm/gsup.c
+++ b/src/gsm/gsup.c
@@ -385,6 +385,14 @@
 			gsup_msg->pdp_charg_enc_len = value_len;
 			break;
 
+		case OSMO_GSUP_SESSION_ID_IE:
+			gsup_msg->session_id = osmo_decode_big_endian(value, value_len);
+			break;
+
+		case OSMO_GSUP_SESSION_STATE_IE:
+			gsup_msg->session_state = *value;
+			break;
+
 		default:
 			LOGP(DLGSUP, LOGL_NOTICE,
 			     "GSUP IE type %d unknown\n", iei);
@@ -564,6 +572,14 @@
 				gsup_msg->pdp_charg_enc_len, gsup_msg->pdp_charg_enc);
 	}
 
+	if ((u8 = gsup_msg->session_state)) {
+		size_t len = sizeof(gsup_msg->session_id);
+		uint8_t *sid = osmo_encode_big_endian(gsup_msg->session_id, len);
+
+		msgb_tlv_put(msg, OSMO_GSUP_SESSION_ID_IE, len, sid);
+		msgb_tlv_put(msg, OSMO_GSUP_SESSION_STATE_IE, sizeof(u8), &u8);
+	}
+
 	return 0;
 }